propagate from branch 'i2p.i2p.zzz.test4' (head 3569f7d0608498cadafc88e87a0ad2b18c44dfb6)

to branch 'i2p.i2p' (head ddc9be27c47878e472d5b6c281cccb6094c42c9a)
2010-11-17 16:09:19 +00:00
parent f698ef93e8 b9a6dfbcda
commit 2f880f7b5b
73 changed files with 4497 additions and 2504 deletions
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@ -882,7 +882,7 @@ public class SnarkManager implements Snark.CompleteListener {
 //       , "Galen", "http://5jpwQMI5FT303YwKa5Rd38PYSX04pbIKgTaKQsWbqoWjIfoancFdWCShXHLI5G5ofOb0Xu11vl2VEMyPsg1jUFYSVnu4-VfMe3y4TKTR6DTpetWrnmEK6m2UXh91J5DZJAKlgmO7UdsFlBkQfR2rY853-DfbJtQIFl91tbsmjcA5CGQi4VxMFyIkBzv-pCsuLQiZqOwWasTlnzey8GcDAPG1LDcvfflGV~6F5no9mnuisZPteZKlrv~~TDoXTj74QjByWc4EOYlwqK8sbU9aOvz~s31XzErbPTfwiawiaZ0RUI-IDrKgyvmj0neuFTWgjRGVTH8bz7cBZIc3viy6ioD-eMQOrXaQL0TCWZUelRwHRvgdPiQrxdYQs7ixkajeHzxi-Pq0EMm5Vbh3j3Q9kfUFW3JjFDA-MLB4g6XnjCbM5J1rC0oOBDCIEfhQkszru5cyLjHiZ5yeA0VThgu~c7xKHybv~OMXION7V8pBKOgET7ZgAkw1xgYe3Kkyq5syAAAA.i2p/tr/announce.php=http://galen.i2p/tr/"
       "POSTMAN", "http://tracker2.postman.i2p/announce.php=http://tracker2.postman.i2p/"
       ,"WELTERDE", "http://tracker.welterde.i2p/a=http://tracker.welterde.i2p/stats?mode=top5"
-       , "CRSTRACK", "http://b4G9sCdtfvccMAXh~SaZrPqVQNyGQbhbYMbw6supq2XGzbjU4NcOmjFI0vxQ8w1L05twmkOvg5QERcX6Mi8NQrWnR0stLExu2LucUXg1aYjnggxIR8TIOGygZVIMV3STKH4UQXD--wz0BUrqaLxPhrm2Eh9Hwc8TdB6Na4ShQUq5Xm8D4elzNUVdpM~RtChEyJWuQvoGAHY3ppX-EJJLkiSr1t77neS4Lc-KofMVmgI9a2tSSpNAagBiNI6Ak9L1T0F9uxeDfEG9bBSQPNMOSUbAoEcNxtt7xOW~cNOAyMyGydwPMnrQ5kIYPY8Pd3XudEko970vE0D6gO19yoBMJpKx6Dh50DGgybLQ9CpRaynh2zPULTHxm8rneOGRcQo8D3mE7FQ92m54~SvfjXjD2TwAVGI~ae~n9HDxt8uxOecAAvjjJ3TD4XM63Q9TmB38RmGNzNLDBQMEmJFpqQU8YeuhnS54IVdUoVQFqui5SfDeLXlSkh4vYoMU66pvBfWbAAAA.i2p/tracker/announce.php=http://crstrack.i2p/tracker/"
+//       , "CRSTRACK", "http://b4G9sCdtfvccMAXh~SaZrPqVQNyGQbhbYMbw6supq2XGzbjU4NcOmjFI0vxQ8w1L05twmkOvg5QERcX6Mi8NQrWnR0stLExu2LucUXg1aYjnggxIR8TIOGygZVIMV3STKH4UQXD--wz0BUrqaLxPhrm2Eh9Hwc8TdB6Na4ShQUq5Xm8D4elzNUVdpM~RtChEyJWuQvoGAHY3ppX-EJJLkiSr1t77neS4Lc-KofMVmgI9a2tSSpNAagBiNI6Ak9L1T0F9uxeDfEG9bBSQPNMOSUbAoEcNxtt7xOW~cNOAyMyGydwPMnrQ5kIYPY8Pd3XudEko970vE0D6gO19yoBMJpKx6Dh50DGgybLQ9CpRaynh2zPULTHxm8rneOGRcQo8D3mE7FQ92m54~SvfjXjD2TwAVGI~ae~n9HDxt8uxOecAAvjjJ3TD4XM63Q9TmB38RmGNzNLDBQMEmJFpqQU8YeuhnS54IVdUoVQFqui5SfDeLXlSkh4vYoMU66pvBfWbAAAA.i2p/tracker/announce.php=http://crstrack.i2p/tracker/"
    };
    
    /** comma delimited list of name=announceURL=baseURL for the trackers to be displayed */
--- a/apps/i2psnark/java/src/org/klomp/snark/Storage.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Storage.java
@ -358,7 +358,7 @@ public class Storage
  /**
   *  Must call setPiecePriorities() after calling this
   *  @param file canonical path (non-directory)
-   *  @param priority default 0; <0 to disable
+   *  @param pri default 0; <0 to disable
   *  @since 0.8.1
   */
  public void setPriority(String file, int pri) {
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@ -186,6 +186,7 @@ public class I2PSnarkServlet extends Default {
            out.write("<div class=\"snarknavbar\"><a href=\"/i2psnark/\" title=\"");
            out.write(_("Torrents"));
            out.write("\" class=\"snarkRefresh\">");
+            out.write("<img border=\"0\" src=\"/themes/snark/ubergine/images/arrow_refresh.png\"> ");
            out.write(_("I2PSnark"));
            out.write("</a>");
        } else {
@ -273,7 +274,7 @@ public class I2PSnarkServlet extends Default {
        out.write("</th>\n<th align=\"center\">");
        out.write("<img border=\"0\" src=\"/themes/snark/ubergine/images/eta.png\" title=\"");
        out.write(_("Estimated Download Time"));
-        out.write("\">");
+        out.write("\">");  // space here would look better but nbsp is too big and thinsp breaks
        out.write(_("ETA"));
        out.write("</th>\n<th align=\"center\">");
        out.write("<img border=\"0\" src=\"/themes/console/images/inbound.png\" title=\"");
@ -288,7 +289,8 @@ public class I2PSnarkServlet extends Default {
        out.write("</th>\n<th align=\"center\">");
        out.write("<img border=\"0\" src=\"/themes/console/images/inbound.png\" title=\"");
        out.write(_("Down Rate"));
-        out.write("\">Rate");
+        out.write("\">");
+        out.write(_("Rate"));
        out.write("</th>\n<th align=\"center\">");
        out.write("<img border=\"0\" src=\"/themes/console/images/outbound.png\" title=\"");
        out.write(_("Up Rate"));
@ -637,7 +639,7 @@ public class I2PSnarkServlet extends Default {
        return rv;
    }

-    private static final int MAX_DISPLAYED_FILENAME_LENGTH = 44;
+    private static final int MAX_DISPLAYED_FILENAME_LENGTH = 50;
    private static final int MAX_DISPLAYED_ERROR_LENGTH = 6;
    private void displaySnark(PrintWriter out, Snark snark, String uri, int row, long stats[], boolean showPeers, boolean showDebug) throws IOException {
        String filename = snark.torrent;
@ -794,7 +796,7 @@ public class I2PSnarkServlet extends Default {
                out.write("&nbsp;<a href=\"" + baseURL + "details.php?dllist=1&filelist=1&info_hash=");
                out.write(TrackerClient.urlencode(snark.meta.getInfoHash()));
                out.write("\" title=\"" + name + ' ' + _("Tracker") + "\" target=\"_blank\">");
-                out.write("<img border=\"0\" src=\"/themes/snark/ubergine/images/details.png\">");
+                out.write("<div class=\"infoz\"><img border=\"0\" src=\"/themes/snark/ubergine/images/details.png\"></div>");
                out.write("</a>");
                break;
            }
@ -807,17 +809,17 @@ public class I2PSnarkServlet extends Default {
        out.write("</td>\n\t");
        out.write("<td align=\"right\" class=\"snarkTorrentDownloaded " + rowClass + "\">");
        if (remaining > 0)
-            out.write(formatSize(total-remaining) + "&thinsp;/&thinsp;" + formatSize(total)); // 18MB/3GB; thin space so it will line break well
+            out.write(formatSize(total-remaining) + "/" + formatSize(total)); // 18MB/3GB; remove thin space so line does _not_ break. We don't want a break here.
        else
            out.write(formatSize(total)); // 3GB
        out.write("</td>\n\t");
        out.write("<td align=\"right\" class=\"snarkTorrentUploaded " + rowClass 
                  + "\">" + formatSize(uploaded) + "</td>\n\t");
-        out.write("<td align=\"right\" class=\"snarkTorrentRate\">");
+        out.write("<td align=\"right\" class=\"snarkTorrentRateDown\">");
        if(isRunning && remaining > 0)
            out.write(formatSize(downBps) + "ps");
        out.write("</td>\n\t");
-        out.write("<td align=\"right\" class=\"snarkTorrentRate\">");
+        out.write("<td align=\"right\" class=\"snarkTorrentRateUp\">");
        if(isRunning)
            out.write(formatSize(upBps) + "ps");
        out.write("</td>\n\t");
@ -1003,7 +1005,10 @@ public class I2PSnarkServlet extends Default {
        out.write(_("Add Torrent"));
        out.write("</span><hr>\n<table border=\"0\"><tr><td>");
        out.write(_("From URL"));
-        out.write(":<td><input type=\"text\" name=\"newURL\" size=\"85\" value=\"" + newURL + "\" > \n");
+        out.write(":<td><input type=\"text\" name=\"newURL\" size=\"85\" value=\"" + newURL + "\"");
+        out.write("title=\"");
+        out.write(_("Torrent file must originate from an I2P-based tracker"));
+        out.write("\"> \n");
        // not supporting from file at the moment, since the file name passed isn't always absolute (so it may not resolve)
        //out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\" value=\"" + newFile + "\" /><br>");
        out.write("<input type=\"submit\" value=\"");
@ -1085,10 +1090,7 @@ public class I2PSnarkServlet extends Default {
        out.write("</span><hr>\n");
        out.write("<table border=\"0\"><tr><td>");
        out.write(_("Data directory"));
-        out.write(": <td><input type=\"text\" size=\"50\" name=\"dataDir\" value=\"" + dataDir + "\" ");
-        out.write("title=\"");
-        out.write(_("Directory to store torrents and data"));
-        out.write("\" disabled=\"true\" ><br><i>(");
+        out.write(": <td><code>" + dataDir + "</code> (");
        out.write(_("Edit i2psnark.config and restart to change"));
        out.write(")</i><br>\n");

@ -1356,28 +1358,34 @@ public class I2PSnarkServlet extends Default {
        title = _("Torrent") + ": " + title;
        buf.append(title);
        buf.append("</TITLE>").append(HEADER).append("<link rel=\"shortcut icon\" href=\"/themes/snark/ubergine/favicon.ico\"></HEAD><BODY>\n<center><div class=\"snarknavbar\"> <a href=\"/i2psnark/\" title=\"Torrents\"");
-        buf.append(" class=\"snarkRefresh\">I2PSnark</a>").append("</div>");
+        buf.append(" class=\"snarkRefresh\"><img border=\"0\" src=\"/themes/snark/ubergine/images/arrow_refresh.png\"> I2PSnark</a>").append("</div>");
        
        if (parent)
-        {
-            buf.append("\n<br><A HREF=\"");
-            // corrupts utf-8
-            //buf.append(URI.encodePath(URI.addPaths(base,"../")));
-            buf.append(URI.addPaths(base,"../"));
-            buf.append("\"><img border=\"0\" src=\"/themes/console/images/outbound.png\"> ")
-               .append(_("Up to higher level directory")).append("</A>\n");
-        }
-        
            buf.append("</div><div class=\"page\"><div class=\"mainsection\">");
            boolean showPriority = snark != null && !snark.storage.complete();
        if (showPriority)
            buf.append("<form action=\"").append(base).append("\" method=\"POST\">\n");
            buf.append("<TABLE BORDER=0 class=\"snarkTorrents\" cellpadding=\"5px 10px\">" +
-                   "<thead><tr><th>").append("<img border=\"0\" src=\"/themes/snark/ubergine/images/file.png\" title=\"").append(_("File")).append("\" alt=\"").append(_("File")).append("\">&nbsp;").append(title).append("</th><th align=\"right\">").append("<img border=\"0\" src=\"/themes/snark/ubergine/images/size.png\" title=\"").append(_("FileSize")).append("\" alt=\"").append(_("FileSize")).append("\">").append(_("Size"));
-        buf.append("</th><th>").append("<img border=\"0\" src=\"/themes/snark/ubergine/images/status.png\" title=\"").append(_("Download Status")).append("\">").append(_("Status")).append("</th>");
+            "<thead><tr><th>")
+            .append("<img border=\"0\" src=\"/themes/snark/ubergine/images/file.png\" title=\"")
+            .append(_("File")).append("\" alt=\"").append(_("File")).append("\">&nbsp;")
+            .append(title).append("</th><th align=\"right\">")
+            .append("<img border=\"0\" src=\"/themes/snark/ubergine/images/size.png\" title=\"")
+            .append(_("FileSize")).append("\" alt=\"").append(_("FileSize")).append("\">").append(_("Size"));
+            buf.append("</th><th class=\"headerstatus\">")
+            .append("<img border=\"0\" src=\"/themes/snark/ubergine/images/status.png\" title=\"")
+            .append(_("Download Status")).append("\">").append(_("Status")).append("</th>");
        if (showPriority)
-            buf.append("<th>").append(_("Priority")).append("</th>");
+            buf.append("<th class=\"headerpriority\">")
+            .append("<img border=\"0\" src=\"/themes/snark/ubergine/images/priority.png\" title=\"\">")
+            .append(_("Priority")).append("</th>");
            buf.append("</tr></thead>\n");
+            buf.append("<tr><td colspan=\"4\" class=\"ParentDir\"><A HREF=\"");
+            buf.append(URI.addPaths(base,"../"));
+            buf.append("\"><img border=\"0\" src=\"/themes/snark/ubergine/images/up.png\"> ")
+            .append(_("Up to higher level directory")).append("</A></td></tr>\n");
+
+
        //DateFormat dfmt=DateFormat.getDateTimeInstance(DateFormat.MEDIUM,
        //                                               DateFormat.MEDIUM);
        boolean showSaveButton = false;
@ -1465,7 +1473,7 @@ public class I2PSnarkServlet extends Default {
            buf.append(status);
            buf.append("</TD>");
            if (showPriority) {
-                buf.append("<td>");
+                buf.append("<td class=\"priority\">");
                File f = item.getFile();
                if ((!complete) && (!item.isDirectory()) && f != null) {
                    int pri = snark.storage.getPriority(f.getCanonicalPath());
@ -1482,7 +1490,7 @@ public class I2PSnarkServlet extends Default {
                    buf.append("<input type=\"radio\" value=\"-9\" name=\"pri.").append(f.getCanonicalPath()).append("\" ");
                    if (pri < 0)
                        buf.append("checked=\"true\"");
-                    buf.append('>').append(_("Do not download"));
+                    buf.append('>').append(_("Ignore"));
                    showSaveButton = true;
                }
                buf.append("</td>");
--- a/apps/i2psnark/locale/messages_de.po
+++ b/apps/i2psnark/locale/messages_de.po
--- a/apps/i2psnark/locale/messages_fr.po
+++ b/apps/i2psnark/locale/messages_fr.po
@ -0,0 +1,844 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2psnark package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# foo <foo@bar>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P i2psnark\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-13 08:01+0000\n"
+"PO-Revision-Date: 2010-11-16 19:20+0100\n"
+"Last-Translator: mixxy <m1xxy@mail.i2p>\n"
+"Language-Team: foo <foo@bar>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: French\n"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:90
+#, java-format
+msgid "Adding torrents in {0} minutes"
+msgstr "Ajouter des torrents dans {0} minutes"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:261
+#, java-format
+msgid "Total uploaders limit changed to {0}"
+msgstr "Limite agrégée des uploaders modifiée : {0}"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:263
+#, java-format
+msgid "Minimum total uploaders limit is {0}"
+msgstr "La limite minimale agrégée des uploaders est : {0}"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:275
+#, java-format
+msgid "Up BW limit changed to {0}KBps"
+msgstr "La limite d'upload modifiée : {0} Ko/s"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:277
+#, java-format
+msgid "Minimum up bandwidth limit is {0}KBps"
+msgstr "La limite minimale d'upload est {0} Ko/s"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:289
+#, java-format
+msgid "Startup delay limit changed to {0} minutes"
+msgstr "Delais de démarrage modifié : {0] minutes"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:336
+msgid "I2CP and tunnel changes will take effect after stopping all torrents"
+msgstr "Les modifications I2CP et des tunnels seront prise en compte après avoir arrêté tous les torrents"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:343
+msgid "Disconnecting old I2CP destination"
+msgstr "Déconnexion des anciennes destination I2CP"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:347
+#, 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:351
+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:355
+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:357
+msgid "Reconnected on the new I2CP destination"
+msgstr "Reconnexion sur la nouvelle destination I2CP"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:368
+#, java-format
+msgid "I2CP listener restarted for \"{0}\""
+msgstr "Listener I2CP redémarré pour \"{0}\""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:379
+msgid "Enabled autostart"
+msgstr "Le démarrage automatique est activé"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:381
+msgid "Disabled autostart"
+msgstr "Le démarrage automatique est désactivé"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:387
+msgid "Enabled open trackers - torrent restart required to take effect."
+msgstr "Les open trackers sont activés - ceci a nécessité un redémarrage des torrents pour être pris en compte."
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:389
+msgid "Disabled open trackers - torrent restart required to take effect."
+msgstr "Les open trackers sont désactivés - ceci a nécessité un redémarrage des torrents pour être pris en compte."
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:396
+msgid "Open Tracker list changed - torrent restart required to take effect."
+msgstr "Liste des Open trackers modifiée - ceci nécessite un redémarrage des torrents pour être pris en compte"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:403
+msgid "Configuration unchanged."
+msgstr "La configuration n'a pas été modifiée"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:413
+#, 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:452
+msgid "Connecting to I2P"
+msgstr "Connexion à I2P"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:455
+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:464
+#, 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:486
+#, java-format
+msgid "Cannot open \"{0}\""
+msgstr "Impossible d'ouvrir: \"{0}\""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:499
+#, java-format
+msgid "Warning - Ignoring non-i2p tracker in \"{0}\", will announce to i2p open trackers only"
+msgstr "Attention - Les trackers non-i2p dans \"{0}\" sont ignorés, seuls les open trackers I2P seront utilisés!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:501
+#, java-format
+msgid "Warning - Ignoring non-i2p tracker in \"{0}\", and open trackers are disabled, you must enable open trackers before starting the torrent!"
+msgstr "Attention - Les trackers non-i2p dans \"{0}\" sont ignorés, et les open trackers sont désactivés, vous devez activer les open trackers avant de démarrer le torrent!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:521
+#, java-format
+msgid "Torrent in \"{0}\" is invalid"
+msgstr "Le torrent dans \"{0}\" est invalide"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:536
+#, java-format
+msgid "Torrent added and started: \"{0}\""
+msgstr "Torrent ajouté et démarré: \"{0}\""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:538
+#, java-format
+msgid "Torrent added: \"{0}\""
+msgstr "Torrent ajouté: \"{0}\""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:692
+#, 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:694
+#, 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:696
+#, java-format
+msgid "No pieces in \"{0}\",  deleting it!"
+msgstr "Pas de morceaux dans \"{0}\", suppression!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:698
+#, java-format
+msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
+msgstr "Trop de morceaux dans \"{0}\" , la limite est {1}, suppression!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:700
+#, java-format
+msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
+msgstr "Les morceaux sont trop larges dans \"{0}\" ({1}B), suppresion."
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:701
+#, java-format
+msgid "Limit is {0}B"
+msgstr "La limite est de \"{0}\"Octets"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:709
+#, 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:725
+#, 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:746
+#, java-format
+msgid "Torrent stopped: \"{0}\""
+msgstr "Torrent arrêté:\"{0}\""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:761
+#, java-format
+msgid "Torrent removed: \"{0}\""
+msgstr "Torrent supprimé:\"{0}\""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:799
+#, java-format
+msgid "Download finished: {0}"
+msgstr "Téléchargement terminé:\"{0}\""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:799
+#, java-format
+msgid "size: {0}B"
+msgstr "Taille: {0}Octets"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:827
+msgid "Unable to connect to I2P!"
+msgstr "Impossible de se connecter à I2P!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:833
+#, java-format
+msgid "Unable to add {0}"
+msgstr "Impossible d'ajouter {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:176
+msgid "I2PSnark - Anonymous BitTorrent Client"
+msgstr "I2PSnark - Client BitTorrent anonyme"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:187
+msgid "Torrents"
+msgstr "Torrents"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:190
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:197
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:901
+msgid "I2PSnark"
+msgstr "I2PSnark"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:194
+msgid "Refresh page"
+msgstr "Rafraîchir la page"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:199
+msgid "Forum"
+msgstr "Forum"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:246
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:248
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1377
+msgid "Status"
+msgstr "État"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:255
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:257
+msgid "Hide Peers"
+msgstr "Cacher les pairs"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:262
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:264
+msgid "Show Peers"
+msgstr "Afficher les pairs"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:271
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1358
+msgid "Torrent"
+msgstr "Torrent"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:276
+msgid "Estimated Download Time"
+msgstr "Temps estimé de téléchargement"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:278
+msgid "ETA"
+msgstr "Temps restant"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:281
+msgid "Downloaded"
+msgstr "Téléchargé"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:283
+msgid "RX"
+msgstr "Reçu"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:286
+msgid "Uploaded"
+msgstr "Envoyé"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:288
+msgid "TX"
+msgstr "Envoyé"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:291
+msgid "Down Rate"
+msgstr "Taux de téléchargement"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:293
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:298
+msgid "Rate"
+msgstr "Vitesse"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:296
+msgid "Up Rate"
+msgstr "Taux d'envoi"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:304
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:307
+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:309
+msgid "Stop All"
+msgstr "Arrêter tout"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:315
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:318
+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:336
+msgid "No torrents loaded."
+msgstr "Aucun torrent chargé."
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:341
+msgid "Totals"
+msgstr "Totaux"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:343
+#, 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:346
+#, java-format
+msgid "1 connected peer"
+msgid_plural "{0} connected peers"
+msgstr[0] "1 pair connecté"
+msgstr[1] "{0} pairs connectés"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:375
+#, java-format
+msgid "Torrent file {0} does not exist"
+msgstr "Le fichier torrent {0} n'existe pas"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:385
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1629
+#, java-format
+msgid "Torrent already running: {0}"
+msgstr "Torrent déjà actif: {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:387
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1631
+#, java-format
+msgid "Torrent already in the queue: {0}"
+msgstr "Torrent déjà dans la queue: {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:391
+#, java-format
+msgid "Copying torrent to {0}"
+msgstr "Copie du torrent vers {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:394
+#, java-format
+msgid "Unable to copy the torrent to {0}"
+msgstr "Impossible de copier le torrent vers {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:394
+#, java-format
+msgid "from {0}"
+msgstr "depuis {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:402
+#, java-format
+msgid "Fetching {0}"
+msgstr "Envoi {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:406
+msgid "Invalid URL - must start with http://"
+msgstr "URL invalide - elle doit débuter par http://"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:436
+#, java-format
+msgid "Starting up torrent {0}"
+msgstr "Démarrage du torrent {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:456
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:474
+#, java-format
+msgid "Torrent file deleted: {0}"
+msgstr "Fichier torrent effacé: {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:480
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490
+#, java-format
+msgid "Data file deleted: {0}"
+msgstr "Fichier de données effacé: {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:482
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492
+#, 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:501
+#, java-format
+msgid "Data dir deleted: {0}"
+msgstr "Répertoire des données effacé: {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:533
+msgid "Error creating torrent - you must select a tracker"
+msgstr "Erreur lors de la création du torrent - vous devez sélectionner un tracker"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:548
+#, java-format
+msgid "Torrent created for \"{0}\""
+msgstr "Torrent créé pour \"{0}\""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:551
+#, 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:553
+#, 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:556
+#, 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:559
+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:562
+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/web/I2PSnarkServlet.java:573
+msgid "I2P tunnel closed."
+msgstr "Tunnel I2P fermé."
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:576
+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/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:915
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:701
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:706
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:712
+msgid "Tracker Error"
+msgstr "Erreur du tracker"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:704
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:720
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:724
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:732
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:736
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:741
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:745
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:749
+#, java-format
+msgid "1 peer"
+msgid_plural "{0} peers"
+msgstr[0] "1 Pair"
+msgstr[1] "{0} Pairs"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:717
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:722
+msgid "Seeding"
+msgstr "Seed en cours"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:726
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1427
+msgid "Complete"
+msgstr "Complet"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:729
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:734
+msgid "Downloading"
+msgstr "Téléchargement en cours"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:738
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:743
+msgid "Stalled"
+msgstr "Figé"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:747
+msgid "No Peers"
+msgstr "Pas de pair"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:751
+msgid "Stopped"
+msgstr "Arrêté"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:766
+msgid "View files"
+msgstr "Voir les fichiers"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:768
+msgid "Open file"
+msgstr "Ouvrir fichier"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049
+msgid "Tracker"
+msgstr "Tracker"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:836
+msgid "Stop the torrent"
+msgstr "Arrêter le torrent"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:838
+msgid "Stop"
+msgstr "Arrêter"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:845
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:848
+msgid "Start the torrent"
+msgstr "Arrêter le torrent"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:850
+msgid "Start"
+msgstr "Démarrer"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:856
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:864
+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 quite must be escaped
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:861
+#, java-format
+msgid "Are you sure you want to delete the file \\''{0}.torrent\\'' (downloaded data will not be deleted) ?"
+msgstr "Etes-vous certain de vouloir supprimer le fichier  \\''{0}.torrent\\'' (les données déjà téléchargées ne seront pas supprimées) ?"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866
+msgid "Remove"
+msgstr "Enlever"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:871
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:879
+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 quite must be escaped
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:876
+#, java-format
+msgid "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded data?"
+msgstr "Etes-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:881
+msgid "Delete"
+msgstr "Supprimer"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:925
+msgid "Seed"
+msgstr "Seed"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:943
+msgid "Uninteresting (The peer has no pieces we need)"
+msgstr "aucun intérêt (le pair n'a aucun morceau utile)"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:945
+msgid "Choked (The peer is not allowing us to request pieces)"
+msgstr "bridé (le pair ne nous permet pas de demander un morceau)"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:959
+msgid "Uninterested (We have no pieces the peer needs)"
+msgstr "aucun intérêt (nous n'avons aucun morceau utile au pair)"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:961
+msgid "Choking (We are not allowing the peer to request pieces)"
+msgstr "bridage (nous ne permettons pas au pair de demander un morceau)"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1005
+msgid "Add Torrent"
+msgstr "Ajouter torrent"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1007
+msgid "From URL"
+msgstr "Depuis l'url"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1010
+msgid "Torrent file must originate from an I2P-based tracker"
+msgstr "Le fichier torrent doit provenir d'un tracker I2P"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1015
+msgid "Add torrent"
+msgstr "Ajouter torrent"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1018
+#, 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:1020
+msgid "Removing a .torrent will cause it to stop."
+msgstr "La suppression d'un fichier .torrent entraine l'arrêt du torrent"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1040
+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:1043
+msgid "Data to seed"
+msgstr "Données à seeder"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1047
+msgid "File or directory to seed (must be within the specified path)"
+msgstr "Fichier ou répertoire à seeder (doit être dans le chemin spécifié)"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1051
+msgid "Select a tracker"
+msgstr "Sélectionner un tracker"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1064
+msgid "or"
+msgstr "ou"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1067
+msgid "Specify custom tracker announce URL"
+msgstr "Spécifier une URL personnalisée d'annonce de tracker"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1070
+msgid "Create torrent"
+msgstr "Créer torrent"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1089
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1213
+msgid "Configuration"
+msgstr "Configuration"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1092
+msgid "Data directory"
+msgstr "Répertoire de données"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
+msgid "Edit i2psnark.config and restart to change"
+msgstr "Editez i2psnark.config et redémarrez pour prendre en compte les modifications"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1098
+msgid "Auto start"
+msgstr "Démarrage automatique"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1102
+msgid "If checked, automatically start torrents that are added"
+msgstr "Si coché, les torrents démarrerons automatiquement lors de l'ajout"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1106
+msgid "Startup delay"
+msgstr "Délais de démarrage"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1108
+msgid "minutes"
+msgstr "minutes"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1132
+msgid "Total uploader limit"
+msgstr "Limite totale d'envoi"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1135
+msgid "peers"
+msgstr "pairs"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1139
+msgid "Up bandwidth limit"
+msgstr "Limite de bande passante en envoi"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142
+msgid "Half available bandwidth recommended."
+msgstr "La moitié de la bande passante est recommandée."
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1144
+msgid "View or change router bandwidth"
+msgstr "Consulter ou modifier la bande passante du routeur"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1148
+msgid "Use open trackers also"
+msgstr "Utiliser les open trackers aussi"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1152
+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:1156
+msgid "Open tracker announce URLs"
+msgstr "URL d'annonce open tracker"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
+msgid "Inbound Settings"
+msgstr "Paramètres entrants"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1174
+msgid "Outbound Settings"
+msgstr "Paramètres sortants"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1181
+msgid "I2CP host"
+msgstr "Hôte I2CP"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1186
+msgid "I2CP port"
+msgstr "Port I2CP"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1198
+msgid "I2CP options"
+msgstr "Options I2CP"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1203
+msgid "Save configuration"
+msgstr "Sauvegarder la configuration"
+
+#. * dummies for translation
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1221
+#, java-format
+msgid "1 hop"
+msgid_plural "{0} hops"
+msgstr[0] "1 saut"
+msgstr[1] "{0} sauts"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1222
+#, 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:1371
+msgid "File"
+msgstr "Fichier"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1374
+msgid "FileSize"
+msgstr "Taille du fichier"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1374
+msgid "Size"
+msgstr "Taille"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1377
+msgid "Download Status"
+msgstr "État du téléchargement"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1381
+msgid "Priority"
+msgstr "Priorité"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1386
+msgid "Up to higher level directory"
+msgstr "Vers le répertoire parent"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1411
+msgid "Directory"
+msgstr "Répertoire"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1416
+msgid "Torrent not found?"
+msgstr "Torrent non trouvé?"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1424
+msgid "File not found in torrent?"
+msgstr "Fichier non trouvé dans le torrent?"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1431
+msgid "complete"
+msgstr "complet"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1432
+msgid "bytes remaining"
+msgstr "Octets restants"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1483
+msgid "High"
+msgstr "Haut"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1488
+msgid "Normal"
+msgstr "Normal"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1493
+msgid "Ignore"
+msgstr "Ignore"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502
+msgid "Save priorities"
+msgstr "Sauvegarder les priorités"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1609
+#, java-format
+msgid "Torrent fetched from {0}"
+msgstr "Torrent envoyé de {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1637
+#, java-format
+msgid "Torrent at {0} was not valid"
+msgstr "Le torrent {0} n'est pas valide"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1642
+#, java-format
+msgid "Torrent was not retrieved from {0}"
+msgstr "Le torrent n'a pas été reçu par {0}"
+
+#~ msgid "Start All"
+#~ msgstr "Démarrer tout"
+#~ msgid "OK"
+#~ msgstr "OK"
+#~ msgid "Details"
+#~ msgstr "Détails"
+#~ msgid "Depuis l'URL"
+#~ msgstr "Quell-URL"
+#~ msgid "Directory to store torrents and data"
+#~ msgstr "Répertoire de stockage des torrents et des données"
+#~ msgid "Cannot change the I2CP settings while torrents are active"
+#~ msgstr "On ne peut changer les paramètres I2CP pendant que des torrents sont actifs"
+#~ msgid "Non-i2p tracker in \"{0}\", deleting it from our list of trackers!"
+#~ msgstr "Tracker non-i2p dans \"{0}\", suppression de notre liste de trackers!"
+#~ msgid "{0} torrents"
+#~ msgstr "{0} Torrents"
+#~ msgid "Uninteresting"
+#~ msgstr "Pas intéressant"
+#~ msgid "Choked"
+#~ msgstr "Choked"
+#~ msgid "Uninterested"
+#~ msgstr "Pas interessé"
+#~ msgid "Choking"
+#~ msgstr "Choking"
+#~ msgid "Custom tracker URL"
+#~ msgstr "URL tracker spécifique"
+#~ msgid "Configure"
+#~ msgstr "Configurer"
+
--- a/apps/i2psnark/locale/messages_ru.po
+++ b/apps/i2psnark/locale/messages_ru.po
--- a/apps/i2ptunnel/locale/messages_de.po
+++ b/apps/i2ptunnel/locale/messages_de.po
@ -8,87 +8,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P i2ptunnel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-13 19:23+0000\n"
-"PO-Revision-Date: 2010-06-15 14:09+0100\n"
-"Last-Translator: echelon <echelon@i2pmail.org>\n"
+"POT-Creation-Date: 2010-11-08 18:21+0000\n"
+"PO-Revision-Date: 2010-11-13 03:16+0100\n"
+"Last-Translator: mixxy <m1xxy@mail.i2p>\n"
 "Language-Team: foo <foo@bar>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: German\n"

-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:493
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:492
 #, 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 "Um das Ziel in ihrer Host Datenbank zu besuchen, klicken Sie <a href=\"{0}\">hier</a>. Um das Ziel aus der kollidierenden Adresshelfer Anfrage zu besuchen, klicken Sie <a href=\"{1}\">hier</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:909
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:917
 msgid "Click a link below to look for an address helper by using a \"jump\" service:"
-msgstr "Durch klicken auf einen der unten stehenden Links bekommen Sie einen Adresshelfer von einem \"Jump\" Service:"
+msgstr "Durch Klicken auf einen der untenstehenden Links bekommen Sie einen Adresshelfer von einem \"Sprung\"-Service:"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:369
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:382
 msgid "New Tunnel"
 msgstr "Neuer Tunnel"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:389
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:402
 msgid "Standard client"
-msgstr "Standard Klient"
+msgstr "Standardklient"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:390
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:403
 msgid "HTTP client"
-msgstr "HTTP Klient"
+msgstr "HTTP-Klient"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:391
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:404
 msgid "IRC client"
-msgstr "IRC Klient"
+msgstr "IRC-Klient"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:392
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:405
 msgid "Standard server"
-msgstr "Standard Server"
+msgstr "Standardserver"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:393
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:406
 msgid "HTTP server"
-msgstr "HTTP Server"
+msgstr "HTTP-Server"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:394
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:407
 msgid "SOCKS 4/4a/5 proxy"
-msgstr "SOCKS 4/4a/5 Proxy"
+msgstr "SOCKS-4/4a/5-Proxy"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:395
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:408
 msgid "SOCKS IRC proxy"
-msgstr "SOCKS IRC Proxy"
+msgstr "SOCKS-IRC-Proxy"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:396
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:409
 msgid "CONNECT/SSL/HTTPS proxy"
-msgstr "CONNECT/SSL/HTTPS Proxy"
+msgstr "CONNECT/SSL/HTTPS-Proxy"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:397
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:410
 msgid "IRC server"
-msgstr "IRC Server"
+msgstr "IRC-Server"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:398
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:411
 msgid "Streamr client"
-msgstr "Streamr Klient"
+msgstr "Streamr-Klient"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:399
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:412
 msgid "Streamr server"
-msgstr "Streamr Server"
+msgstr "Streamr-Server"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:400
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:413
 msgid "HTTP bidir"
 msgstr "HTTP Bidir"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:73
 msgid "I2P Tunnel Manager - Edit Client Tunnel"
-msgstr "I2P Tunnel Manager - Edit Klienten Tunnel"
+msgstr "I2P-Tunnel-Manager - Kliententunnel bearbeiten"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:93
 msgid "Edit proxy settings"
-msgstr "Editiere Proxy Einstellungen"
+msgstr "Proxyeinstellungen bearbeiten"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:101
 msgid "New proxy settings"
-msgstr "Neue Proxy Einstellungen"
+msgstr "Neue Proxyeinstellungen"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:112
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:112
@ -147,17 +147,17 @@ msgstr "Lokal (127.0.0.1)"
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:199
 msgid "Everyone (0.0.0.0)"
-msgstr "Jeder (0.0.0.0)"
+msgstr "Überall (0.0.0.0)"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
 msgid "LAN Hosts (Please specify your LAN address)"
-msgstr "LAN Hosts (Bitte geben Sie ihre LAN Adressen an)"
+msgstr "LAN-Hosts (Bitte geben Sie ihre LAN-Adressen an!)"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:186
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:205
 msgid "Other"
-msgstr "Andere"
+msgstr "Anderen"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:195
 msgid "Outproxies"
@ -165,302 +165,306 @@ msgstr "Ausgehende Proxies"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:202
 msgid "Tunnel Destination"
-msgstr "Tunnel Ziel"
+msgstr "Ziel des Tunnels"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:214
 msgid "name or destination"
 msgstr "Name oder Ziel"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:237
-msgid "Profile"
-msgstr "Profil"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:217
+msgid "b32 not recommended"
+msgstr "B32-Adressen nicht empfohlen"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:223
+msgid "Shared Client"
+msgstr "versch. Klienten"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:244
-msgid "interactive connection"
-msgstr "Interaktive Verbindung"
+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:231
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:248
-msgid "bulk connection (downloads/websites/BT)"
-msgstr "lose Verbindung (Download/Webseiten/BitTorrent)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:233
-msgid "Delay Connect"
-msgstr "Verbindung verzögern"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:237
-msgid "for request/response connections"
-msgstr "für Verbindungen mit Anfragen/Antworten"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
-msgid "Shared Client"
-msgstr "Geteilter Klient"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:243
-msgid "(Share tunnels with other clients and irc/httpclients? Change requires restart of client proxy)"
-msgstr "(Teile Tunnel mit anderen Klienten und IRC/HTTP Klienten? Änderungen benötigen Neustart des Klientenproxys)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:247
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:124
 msgid "Auto Start"
 msgstr "Automatischer Start"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:235
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:128
 msgid "(Check the Box for 'YES')"
-msgstr "(Aktiviere die Box für 'JA')"
+msgstr "(Aktiviere das Kästchen für 'ja')"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:253
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:258
 msgid "Advanced networking options"
-msgstr "Erweiterte Netzwerk Optionen"
+msgstr "Erweiterte Netzwerkoptionen"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
 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 Klienten Proxy auf Teilen der Tunnel konfiguriert, dann gelten diese Optionen für alle Klienten des Proxy Klienten!)"
+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:257
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:268
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:241
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:260
 msgid "Tunnel Options"
-msgstr "Tunnel Optionen"
+msgstr "Tunneloptionen"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:259
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:270
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:262
 msgid "Length"
 msgstr "Länge"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:266
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:277
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:250
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:269
 msgid "0 hop tunnel (low anonymity, low latency)"
-msgstr "0 Hop Tunnel (geringe Anonymität, geringe Latenz)"
+msgstr "0-Hop-Tunnel (geringe Anonymität, geringe Latenz)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:270
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:281
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:254
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:273
 msgid "1 hop tunnel (medium anonymity, medium latency)"
-msgstr "1 Hop Tunnel (mittlere Anonymität, mittlere Latenz)"
+msgstr "1-Hop-Tunnel (mittlere Anonymität, mittlere Latenz)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:274
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:285
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:277
 msgid "2 hop tunnel (high anonymity, high latency)"
-msgstr "2 Hop Tunnel (hohe Anonymität, hohe Latenz)"
+msgstr "2-Hop-Tunnel (hohe Anonymität, hohe Latenz)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:278
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:262
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:281
 msgid "3 hop tunnel (very high anonymity, poor performance)"
-msgstr "3 Hop Tunnel (sehr hohe Anonymität, geringe Performance)"
+msgstr "3-Hop-Tunnel (sehr hohe Anonymität, geringe Leistung)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:287
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:298
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:271
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:290
 msgid "hop tunnel (very poor performance)"
-msgstr "Hop Tunnel (sehr geringe Performance)"
+msgstr "Hop-Tunnel (sehr geringe Leistung)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:292
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:295
 msgid "Variance"
 msgstr "Varianz"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:302
 msgid "0 hop variance (no randomisation, consistant performance)"
-msgstr "0 Hop Varianz (keine zufällige Verteilung, konsistente Performance)"
+msgstr "0-Hop-Varianz (keine zufällige Längenveränderung, konsistente Leistung)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:287
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:306
 msgid "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
-msgstr "+ 0-1 Hop Varianz (mittlere, hinzufügende zufällige Verteilung, verringert 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:307
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:291
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:310
 msgid "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
-msgstr "+ 0-2 Hop Varianz (hohe, hinzufügende zufällige Verteilung, verringert Performance)"
+msgstr "+ 0-2 Hops Varianz (hohe zufällige Verlängerung, verringerte Leistung)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:314
+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:299
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:318
+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:311
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:322
-msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
-msgstr "+ 0-1 Hop Varianz (standard zufällige Verteilung, standard Performance)"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:330
+msgid "hop variance"
+msgstr "Hops Varianz"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:315
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:326
-msgid "+/- 0-2 hop variance (not recommended)"
-msgstr "+/- 0-2 Hop Varianz (nicht empfohlen)"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:316
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:335
+msgid "Count"
+msgstr "Anzahl"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:342
+msgid "1 inbound, 1 outbound tunnel  (low bandwidth usage, less reliability)"
+msgstr "1 eingehender, 1 ausgehender Tunnel (geringe Bandbreitennutzung, weniger zuverlässig)"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:338
-msgid "hop variance"
-msgstr "Hop Varianz"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:332
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:343
-msgid "Count"
-msgstr "Zähler"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:339
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:350
-msgid "1 inbound, 1 outbound tunnel  (low bandwidth usage, less reliability)"
-msgstr "1 eingehender, 1 ausgehender Tunnel (geringe Bandbreitennutzung, wenig Zuverlässigkeit)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:346
 msgid "2 inbound, 2 outbound tunnels (standard bandwidth usage, standard reliability)"
-msgstr "2 eingehende, 2 ausgehende Tunnel (standard Bandbreitennutzung, standard Zuverlässigkeit)"
+msgstr "2 eingehende, 2 ausgehende Tunnel (Standardbandbreitennutzung, zuverlässig)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:347
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:350
 msgid "3 inbound, 3 outbound tunnels (higher bandwidth usage, higher reliability)"
-msgstr "3 eingehende, 3 ausgehende Tunnel (hohe Bandbreitennutzung, hohe Zuverlässigkeit)"
+msgstr "3 eingehende, 3 ausgehende Tunnel (hohe Bandbreitennutzung, zuverlässiger)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:356
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:367
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:340
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:359
 msgid "tunnels"
 msgstr "Tunnel"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:361
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:372
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:345
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
 msgid "Backup Count"
-msgstr "Anzahl an Ersatz"
+msgstr "Anzahl an Ersatztunneln"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:379
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:352
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:371
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
-msgstr "0 Backup Tunnel (0 Redundanz, keine zusätzliche Ressourcennutzung)"
+msgstr "0 Ersatztunnel (0 Redundanz, keine zusätzliche Ressourcennutzung)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:383
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:356
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
-msgstr "1 Backup Tunnel in jede Richtung (geringe Redundanz, geringe Ressourcennutzung)"
+msgstr "1 Ersatztunnel in jede Richtung (geringe Redundanz, geringe Ressourcennutzung)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:376
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:387
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:360
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:379
 msgid "2 backup tunnels each direction (medium redundancy, medium resource usage)"
-msgstr "2 Backup Tunnel in jede Richtung (mittlere Redundanz, mittlere Ressourcennutzung)"
+msgstr "2 Ersatztunnel in jede Richtung (mittlere Redundanz, mittlere Ressourcennutzung)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:364
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:383
+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:373
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:392
+msgid "backup tunnels"
+msgstr "Ersatztunnel"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
-msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
-msgstr "3 Backup Tunnel in jede Richtung (hohe Redundanz, hohe Ressourcennutzung)"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
+msgid "Profile"
+msgstr "Profil"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:389
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:400
-msgid "backup tunnels"
-msgstr "Backup Tunnel"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:387
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:406
+msgid "interactive connection"
+msgstr "Interaktive Verbindung"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:391
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:410
+msgid "bulk connection (downloads/websites/BT)"
+msgstr "Mengenverbindung (Download/Webseiten/BitTorrent)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
+msgid "Delay Connect"
+msgstr "Verbindung verzögern"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397
+msgid "for request/response connections"
+msgstr "für Verbindungen mit Anfragen/Antworten"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:414
 msgid "I2CP Options"
-msgstr "I2CP Optionen"
+msgstr "I2CP-Optionen"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:396
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:403
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:407
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:416
 msgid "Host"
 msgstr "Host"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:407
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:152
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:420
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:244
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:266
 msgid "Port"
 msgstr "Port"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:406
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:452
 msgid "Reduce tunnel quantity when idle"
-msgstr "Reduziert die Anzahl an Tunnel im Leerlauf"
+msgstr "Anzahl an Tunneln im Leerlauf reduzieren"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:422
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:417
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:445
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:415
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:429
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:454
 msgid "Enable"
-msgstr "Aktiviert"
+msgstr "aktiviert"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:412
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:419
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:458
 msgid "Reduced tunnel count"
-msgstr "Reduzierte Tunnel Anzahl"
+msgstr "Reduzierte Tunnelanzahl"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:416
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:423
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:462
 msgid "Idle minutes"
-msgstr "Minuten im Leerlauf"
+msgstr "Minuten Inaktivität"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
 msgid "Close tunnels when idle"
-msgstr "Schliesse Tunnel im Leerlauf"
+msgstr "nicht genutzte Tunnel schließen"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
 msgid "New Keys on Reopen"
 msgstr "Neue Schlüssel beim Wiederöffnen"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:441
 msgid "Disable"
-msgstr "Deaktiviert"
+msgstr "deaktiviert"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:447
 msgid "Delay tunnel open until required"
-msgstr "Verzörgere den Tunnelaufbau bis er benötigt wird"
+msgstr "Aufbau des Tunnela verzögern, bis dieser benötigt wird"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:457
 msgid "Persistent private key"
 msgstr "Dauerhafter privater Schlüssel"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
 msgid "File"
 msgstr "Datei"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:252
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:467
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:235
 msgid "Local destination"
-msgstr "Lokales Ziel"
+msgstr "lokales Ziel"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
 msgid "(if known)"
 msgstr "(falls bekannt)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:468
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:489
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:498
 msgid "Custom options"
 msgstr "Eigene Optionen"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:502
 msgid "NOTE: If tunnel is currently running, most changes will not take effect until tunnel is stopped and restarted."
-msgstr "HINWEIS: Falls der Tunnel gerade aktiv ist werden die meisten Änderungen erst nach einem Neustart des Tunnels wirksam."
+msgstr "HINWEIS: Falls der Tunnel gerade aktiv ist, werden die meisten Änderungen erst nach einem Neustart des Tunnels wirksam."

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:495
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:504
 msgid "Cancel"
 msgstr "Abbrechen"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:508
 msgid "Delete"
 msgstr "Löschen"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:480
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:487
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:510
 msgid "Save"
 msgstr "Speichern"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:73
 msgid "I2P Tunnel Manager - Edit Server Tunnel"
-msgstr "I2P Tunnel Manager - Edit Server Tunnel"
+msgstr "I2P-Tunnel-Manager - Servertunnel bearbeiten"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:93
 msgid "Edit server settings"
-msgstr "Server Einstellungen ändern"
+msgstr "Servereinstellungen ändern"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:101
 msgid "New server settings"
-msgstr "Neue Server Einstellungen"
+msgstr "Neue Servereinstellungen"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:214
 msgid "Website name"
@ -472,88 +476,92 @@ msgstr "(für ausgehende Proxies leer lassen)"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:223
 msgid "Private key file"
-msgstr "Private Schlüsseldatei"
+msgstr "private Schlüsseldatei"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:262
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:245
 msgid "Add to local addressbook"
-msgstr "Zum lokalen Adressbuch hinzufügen"
+msgstr "zum lokalen Adressbuch hinzufügen"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:415
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:252
+msgid "Hostname Signature"
+msgstr "Signatur des Namens"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
 msgid "Encrypt Leaseset"
-msgstr "verschlüsseltes Leaseset"
+msgstr "Leaseset verschlüsseln"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:421
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430
 msgid "Encryption Key"
 msgstr "Schlüssel zum verschlüsseln"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
 msgid "Generate New Key"
 msgstr "Erzeuge neuen Schlüssel"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:436
 msgid "Generate"
-msgstr "Erzeuge"
+msgstr "Erzeugen"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:487
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:496
 msgid "(Tunnel must be stopped first)"
-msgstr "(Tunnel muß zuerst beendet sein)"
+msgstr "(Tunnel muss zuerst beendet sein)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:440
 msgid "Restricted Access List"
-msgstr "Liste zum beschränktem Zugang"
+msgstr "Zugang beschränken"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:437
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:446
 msgid "Access List"
 msgstr "Zugangsliste"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:441
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:450
 msgid "(Restrict to these clients only)"
-msgstr "(Beschränkt auf nur diese Klienten)"
+msgstr "(Zugang wird auf diese Klienten beschränkt)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:466
 msgid "New Certificate type"
 msgstr "Neuer Zertifizierungstyp"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:468
 msgid "None"
-msgstr "Keinen"
+msgstr "Keiner"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472
 msgid "Hashcash (effort)"
 msgstr "Hashcash (Durchsatz)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478
 msgid "Hashcash Calc Time"
 msgstr "Hashcash Berechnungszeit"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:480
 msgid "Estimate"
 msgstr "Abschätzung"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:482
 msgid "Hidden"
 msgstr "Versteckt"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:486
 msgid "Signed (signed by)"
 msgstr "Signiert (unterschrieben von)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:483
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:492
 msgid "Modify Certificate"
 msgstr "Zertifikat modifizieren"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:494
 msgid "Modify"
 msgstr "Modifizieren"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:71
 msgid "I2P Tunnel Manager - List"
-msgstr "I2P Tunnel Manager - List"
+msgstr "I2P-Tunnel-Manager - Liste"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:83
 msgid "Status Messages"
-msgstr "Status Nachrichten"
+msgstr "Statusnachrichten"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:87
 msgid "Refresh"
@ -561,11 +569,11 @@ msgstr "Auffrischen"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:91
 msgid "Stop All"
-msgstr "Alle Stoppen"
+msgstr "Alle stoppen"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:95
 msgid "Start All"
-msgstr "Alle Starten"
+msgstr "Alle starten"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
 msgid "Restart All"
@ -577,12 +585,12 @@ msgstr "Konfiguration neu einlesen"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:105
 msgid "I2P Server Tunnels"
-msgstr "I2P Server Tunnel"
+msgstr "I2P-Servertunnel"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:109
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
 msgid "Points at"
-msgstr "Zeigt auf"
+msgstr "Läuft auf"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:111
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:153
@ -599,7 +607,7 @@ msgstr "Status"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:163
 msgid "Base32 Address"
-msgstr "Basis-32 Adresse"
+msgstr "Basis-32-Adresse"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:171
 msgid "No Preview"
@ -608,7 +616,7 @@ msgstr "Keine Vorschau"
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:184
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:285
 msgid "Starting..."
-msgstr "Starte..."
+msgstr "Starte ..."

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:191
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:205
@ -616,7 +624,7 @@ msgstr "Starte..."
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:320
 msgid "Stop"
-msgstr "Stop"
+msgstr "Stopp"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:198
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:313
@ -645,11 +653,11 @@ msgstr "Standard"
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:238
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:370
 msgid "Create"
-msgstr "Erstelle"
+msgstr "Erstellen"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:240
 msgid "I2P Client Tunnels"
-msgstr "I2P Klienten Tunnel"
+msgstr "I2P-Klienten-Tunnel"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:248
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:274
@ -670,5 +678,5 @@ msgstr "Ziel"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:366
 msgid "New client tunnel"
-msgstr "Neuer Klienten Tunnel"
+msgstr "Neuer Kliententunnel"

--- a/apps/i2ptunnel/locale/messages_ru.po
+++ b/apps/i2ptunnel/locale/messages_ru.po
@ -8,73 +8,74 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P i2ptunnel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-06 00:05+0000\n"
-"PO-Revision-Date: 2010-03-06 00:08+0000\n"
-"Last-Translator: 4get <forget@mail.i2p>\n"
+"POT-Creation-Date: 2010-11-13 22:04+0000\n"
+"PO-Revision-Date: 2010-11-14 19:56+0500\n"
+"Last-Translator: Hidden Z <hiddenz@mail.i2p>\n"
 "Language-Team: foo <foo@bar>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Russian\n"

-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:483
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:492
 #, 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 "Для перехода по ссылке из локальной адресной книги, нажмите <a href=\"{0}\">здесь</a>. Для перехода по новой addresshelper-ссылке, нажмите <a href=\"{1}\">здесь</a>."

-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:886
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:917
 msgid "Click a link below to look for an address helper by using a \"jump\" service:"
 msgstr "Jump-сервисы, которые, возможно, знают нужную Вам addresshelper-ссылку:"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:363
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:382
 msgid "New Tunnel"
 msgstr "Новый туннель"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:383
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:402
 msgid "Standard client"
 msgstr "Обычный клиент"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:384
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:403
 msgid "HTTP client"
 msgstr "HTTP-клиент"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:385
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:404
 msgid "IRC client"
 msgstr "IRC-клиент"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:386
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:405
 msgid "Standard server"
 msgstr "Обычный сервер"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:387
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:406
 msgid "HTTP server"
 msgstr "HTTP-сервер"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:388
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:407
 msgid "SOCKS 4/4a/5 proxy"
 msgstr "SOCKS 4/4a/5 прокси"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:389
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:408
 msgid "SOCKS IRC proxy"
 msgstr "SOCKS IRC прокси"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:390
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:409
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr "CONNECT/SSL/HTTPS прокси"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:391
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:410
 msgid "IRC server"
 msgstr "IRC-сервер"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:392
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:411
 msgid "Streamr client"
 msgstr "Streamr-клиент"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:393
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:412
 msgid "Streamr server"
 msgstr "Streamr-сервер"

-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:394
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:413
 msgid "HTTP bidir"
 msgstr "HTTP bidir (экспериментальный двунаправленный режим, инструкцию спрашивайте у sponge)"

@ -171,284 +172,288 @@ msgstr "Адрес назначения туннеля"
 msgid "name or destination"
 msgstr "имя или адрес"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:237
-msgid "Profile"
-msgstr "Режим"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:217
+msgid "b32 not recommended"
+msgstr "b32 не рекомендуется"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:244
-msgid "interactive connection"
-msgstr "оптимизировать для малых задержек (irc)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:231
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:248
-msgid "bulk connection (downloads/websites/BT)"
-msgstr "оптимизировать для большого обьема (www/bittorrent)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:233
-msgid "Delay Connect"
-msgstr "Задержка соединения"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:237
-msgid "for request/response connections"
-msgstr "оптимизация для соединений, начинающихся с запроса клиента/ответа сервера"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:223
 msgid "Shared Client"
 msgstr "Коллективный клиент"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:227
 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:247
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:231
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:124
 msgid "Auto Start"
 msgstr "Автозапуск"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:235
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:128
 msgid "(Check the Box for 'YES')"
 msgstr "(поставьте галочку для включения)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:253
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:258
 msgid "Advanced networking options"
 msgstr "Расширенные сетевые настройки"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
 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:257
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:268
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:241
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:260
 msgid "Tunnel Options"
 msgstr "Параметры туннеля"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:259
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:270
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:262
 msgid "Length"
 msgstr "Длина"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:266
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:277
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:250
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:269
 msgid "0 hop tunnel (low anonymity, low latency)"
 msgstr "0 хопов (низкая анонимность, малые задержки)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:270
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:281
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:254
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:273
 msgid "1 hop tunnel (medium anonymity, medium latency)"
 msgstr "1 хоп (умеренная анонимность, умеренные задержки)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:274
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:285
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:258
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:277
 msgid "2 hop tunnel (high anonymity, high latency)"
 msgstr "2 хопа (высокая анонимность, высокие задержки)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:278
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:262
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:281
 msgid "3 hop tunnel (very high anonymity, poor performance)"
 msgstr "3 хопа (очень высокая анонимность, низкая производительность)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:287
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:298
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:271
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:290
 msgid "hop tunnel (very poor performance)"
 msgstr "хопов (очень низкая производительность)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:292
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:295
 msgid "Variance"
 msgstr "Разброс"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:302
 msgid "0 hop variance (no randomisation, consistant performance)"
 msgstr "нулевой разброс (без рандомизации, фиксированная производительность)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:287
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:306
 msgid "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
 msgstr "+ 0-1 разброс (умеренно повышенная рандомизация, пониженная производительность)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:291
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:310
 msgid "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
 msgstr "+ 0-2 разброс (сильно повышенная рандомизация, пониженная производительность)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:295
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:314
 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
 msgstr "+/- 0-1 разброс (стандартная рандомизация, стандартная производительность)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:315
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:299
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:318
 msgid "+/- 0-2 hop variance (not recommended)"
 msgstr "+/- 0-2 разброс (не рекомендуется)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:330
 msgid "hop variance"
 msgstr "разброс"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:332
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:316
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:335
 msgid "Count"
 msgstr "Количество"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:339
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:342
 msgid "1 inbound, 1 outbound tunnel  (low bandwidth usage, less reliability)"
 msgstr "1 входящий, 1 исходящий туннель (низкая пропускная способность, низкая надежность) "

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:346
 msgid "2 inbound, 2 outbound tunnels (standard bandwidth usage, standard reliability)"
 msgstr "2 входящих, 2 исходящих туннеля (стандартная пропускная способность, стандартная надежность)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:347
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:331
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:350
 msgid "3 inbound, 3 outbound tunnels (higher bandwidth usage, higher reliability)"
 msgstr "3 входящих, 3 исходящих туннеля (высокая пропускная способность, высокая надежность)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:356
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:367
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:340
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:359
 msgid "tunnels"
 msgstr "туннелей"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:361
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:372
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:345
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
 msgid "Backup Count"
 msgstr "Резервное количество"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:379
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:352
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:371
 msgid "0 backup tunnels (0 redundancy, no added 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:383
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:356
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr "1 резервный туннель в каждом направлении (низкая избыточность, низкая нагрузка на систему)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:376
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:387
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:360
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:379
 msgid "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr "2 резервных туннеля в каждом направлении (умеренная избыточность, умеренная нагрузка на систему)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:364
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:383
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr "3 резервных туннеля в каждом направлении (высокая избыточность, высокая нагрузка на систему)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:389
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:373
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:392
 msgid "backup tunnels"
 msgstr "резервных туннелей"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
+msgid "Profile"
+msgstr "Режим"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:387
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:406
+msgid "interactive connection"
+msgstr "оптимизировать для малых задержек (irc)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:391
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:410
+msgid "bulk connection (downloads/websites/BT)"
+msgstr "оптимизировать для большого обьема (www/bittorrent)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
+msgid "Delay Connect"
+msgstr "Задержка соединения"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397
+msgid "for request/response connections"
+msgstr "оптимизация для соединений, начинающихся с запроса клиента/ответа сервера"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:414
 msgid "I2CP Options"
 msgstr "Параметры I2CP"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:396
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:403
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:146
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:407
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:416
 msgid "Host"
 msgstr "Адрес"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:407
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:152
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:420
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:244
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:266
 msgid "Port"
 msgstr "Порт"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:406
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:445
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:452
 msgid "Reduce tunnel quantity when idle"
 msgstr "Снижать количество туннелей при простое"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:422
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:417
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:447
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:415
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:429
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:454
 msgid "Enable"
 msgstr "Включить"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:412
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:419
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:458
 msgid "Reduced tunnel count"
 msgstr "Количество туннелей"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:416
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:423
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:462
 msgid "Idle minutes"
 msgstr "Минут простоя"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
 msgid "Close tunnels when idle"
 msgstr "Закрыть туннели при простое"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
 msgid "New Keys on Reopen"
 msgstr "Генерировать новый ключ при переоткрытии"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:441
 msgid "Disable"
 msgstr "Выключить"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:447
 msgid "Delay tunnel open until required"
 msgstr "Отложить запуск до первого запроса"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:457
 msgid "Persistent private key"
 msgstr "Постоянный секретный ключ"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463
 msgid "File"
 msgstr "Файл"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:252
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:467
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:235
 msgid "Local destination"
 msgstr "Локальный адрес назначения"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:471
 msgid "(if known)"
 msgstr "(если известен)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:468
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:498
 msgid "Custom options"
 msgstr "Дополнительные параметры"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:495
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:502
 msgid "NOTE: If tunnel is currently running, most changes will not take effect until tunnel is stopped and restarted."
 msgstr "ПРИМЕЧАНИЕ: для вступления в силу измененных настроек потребуется остановка и перезапуск туннеля"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
-msgid "Save"
-msgstr "Сохранить"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:481
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:504
+msgid "Cancel"
+msgstr "Отмена"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:508
 msgid "Delete"
 msgstr "Удалить"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:480
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
-msgid "Cancel"
-msgstr "Отмена"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:487
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:510
+msgid "Save"
+msgstr "Сохранить"

 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:73
 msgid "I2P Tunnel Manager - Edit Server Tunnel"
@ -474,80 +479,80 @@ msgstr "(не заполнять для outproxy)"
 msgid "Private key file"
 msgstr "Файл секретного ключа"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:262
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:245
 msgid "Add to local addressbook"
 msgstr "Добавить в локальную адресную книгу"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:415
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:252
+msgid "Hostname Signature"
+msgstr "Подпись хоста"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
 msgid "Encrypt Leaseset"
 msgstr "Шифровать LeaseSet"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:421
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430
 msgid "Encryption Key"
 msgstr "Ключ шифрования"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
 msgid "Generate New Key"
 msgstr "Сгенерировать новый ключ"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:436
 msgid "Generate"
 msgstr "Сгенерировать"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:489
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:438
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:496
 msgid "(Tunnel must be stopped first)"
 msgstr "(Туннель перед этим следует остановить)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:440
 msgid "Restricted Access List"
 msgstr "Ограниченный доступ"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
-msgid "Unimplemented"
-msgstr "не реализовано"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:439
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:446
 msgid "Access List"
 msgstr "Список доступа"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:450
 msgid "(Restrict to these clients only)"
 msgstr "(Разрешить доступ только перечисленным клиентам)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:466
 msgid "New Certificate type"
 msgstr "Создать новый сертификат. Тип"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:468
 msgid "None"
 msgstr "Без"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472
 msgid "Hashcash (effort)"
 msgstr "Hashcash (экспериментальный)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478
 msgid "Hashcash Calc Time"
 msgstr "Время генерации hashcash-сертификата"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:480
 msgid "Estimate"
 msgstr "Прогноз"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:482
 msgid "Hidden"
 msgstr "Скрытый"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:486
 msgid "Signed (signed by)"
 msgstr "Подписанный (указать кем подписан)"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:492
 msgid "Modify Certificate"
 msgstr "Изменить сертификат"

-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:487
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:494
 msgid "Modify"
 msgstr "Изменить"

@ -677,3 +682,5 @@ msgstr "Адрес назначения"
 msgid "New client tunnel"
 msgstr "Новый клиентский туннель"

+#~ msgid "Unimplemented"
+#~ msgstr "не реализовано"
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
@ -46,9 +46,9 @@ public class ConfigUIHelper extends HelperBase {
         return rv;
    }

-    private static final String langs[] = {"de", "en", "fr", "nl", "ru", "sv", "zh"};
-    private static final String flags[] = {"de", "us", "fr", "nl", "ru", "se", "cn"};
-    private static final String xlangs[] = {_x("German"), _x("English"), _x("French"),
+    private static final String langs[] = {"de", "en", "es", "fr", "nl", "ru", "sv", "zh"};
+    private static final String flags[] = {"de", "us", "es", "fr", "nl", "ru", "se", "cn"};
+    private static final String xlangs[] = {_x("German"), _x("English"), _x("Spanish"),_x("French"),
                                            _x("Dutch"), _x("Russian"), _x("Swedish"), _x("Chinese")};

    /** todo sort by translated string */
--- a/apps/routerconsole/jsp/help.jsp
+++ b/apps/routerconsole/jsp/help.jsp
@ -50,11 +50,11 @@ Do not be concerned if these numbers vary widely.
 <a href="configstats.jsp#router.activePeers">[Enable graphing]</a>.
 <li class="tidylist"><b>Fast:</b>
 This is the number of peers you use for building client tunnels. It is generally in the
-range 8-15. Your fast peers are shown on the <a href="profiles.jsp">profiles page</a>.
+range 8-30. Your fast peers are shown on the <a href="profiles.jsp">profiles page</a>.
 <a href="configstats.jsp#router.fastPeers">[Enable graphing]</a>.
 <li class="tidylist"><b>High Capacity:</b>
 This is the number of peers you use for building some of your exploratory tunnels. It is generally in the
-range 8-25. The fast peers are included in the high capacity tier.
+range 8-75. The fast peers are included in the high capacity tier.
 Your high capacity peers are shown on the <a href="profiles.jsp">profiles page</a>.
 <a href="configstats.jsp#router.highCapacityPeers">[Enable graphing]</a>.
 <li class="tidylist"><b>Well Integrated:</b>
--- a/apps/routerconsole/jsp/help_nl.jsp
+++ b/apps/routerconsole/jsp/help_nl.jsp
@ -54,12 +54,12 @@ vari&euml;ren.
 <a href="configstats.jsp#router.activePeers">[Grafieken inschakelen]</a>.
 <li class="tidylist"><b>Snel:</b>
 Dit is het aantal peers dat je gebruikt om client tunnels mee te bouwen. Het ligt over
-het algemeen tussen 8 en 15.
+het algemeen tussen 8 en 30.
 Je snelle peers worden getoond op de <a href="profiles.jsp">profielen pagina</a>.
 <a href="configstats.jsp#router.fastPeers">[Grafieken inschakelen]</a>.
 <li class="tidylist"><b>Grote capaciteit:</b>
 Dit is het aantal peers dat je gebruikt om sommige van de onderzoekende tunnels mee te maken.
-Het ligt over het algemeen tussen de 8 en 25. De snelle peers zijn inbegrepen in de categorie grote capaciteit.
+Het ligt over het algemeen tussen de 8 en 75. De snelle peers zijn inbegrepen in de categorie grote capaciteit.
 De grote capaciteits peers worden getoond op de <a href="profiles.jsp">profielen pagina</a>.
 <a href="configstats.jsp#router.highCapacityPeers">[Grafieken inschakelen]</a>.
 <li class="tidylist"><b>Ge&iuml;ntegreerd:</b>
--- a/apps/routerconsole/jsp/help_ru.jsp
+++ b/apps/routerconsole/jsp/help_ru.jsp
@ -57,11 +57,11 @@

 <li class="tidylist"><b>Быстрые:</b>

-Количество пиров, которые используются Вашим маршрутизатором для построения клиентских туннелей. В общем случае это значение будет в диапазоне 8-15. Список быстрых пиров можно посмотреть на странице <a href="profiles.jsp">профили</a>. <a href="configstats.jsp#router.fastPeers">[Включить построение графика]</a>. 
+Количество пиров, которые используются Вашим маршрутизатором для построения клиентских туннелей. В общем случае это значение будет в диапазоне 8-30. Список быстрых пиров можно посмотреть на странице <a href="profiles.jsp">профили</a>. <a href="configstats.jsp#router.fastPeers">[Включить построение графика]</a>. 

 <li class="tidylist"><b>Высокоёмкие:</b>

-Количество пиров, которые используются Вашим маршрутизатором для построения части зондирующих туннелей. В общем случае это значение будет в диапазоне 8-25. Быстрые пиры входят в группу высокоёмких. Список высокоёмких пиров можно посмотреть на странице <a href="profiles.jsp">профили</a>. <a href="configstats.jsp#router.highCapacityPeers">[Включить построение графика]</a>. 
+Количество пиров, которые используются Вашим маршрутизатором для построения части зондирующих туннелей. В общем случае это значение будет в диапазоне 8-75. Быстрые пиры входят в группу высокоёмких. Список высокоёмких пиров можно посмотреть на странице <a href="profiles.jsp">профили</a>. <a href="configstats.jsp#router.highCapacityPeers">[Включить построение графика]</a>. 

 <li class="tidylist"><b>Хорошо интегрированные:</b>

--- a/apps/routerconsole/locale/messages_de.po
+++ b/apps/routerconsole/locale/messages_de.po
--- a/apps/routerconsole/locale/messages_ru.po
+++ b/apps/routerconsole/locale/messages_ru.po
--- a/apps/susidns/locale/messages_de.po
+++ b/apps/susidns/locale/messages_de.po
@ -8,125 +8,125 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P susidns\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-13 19:24+0000\n"
-"PO-Revision-Date: 2010-06-15 11:22+0100\n"
-"Last-Translator: echelon <echelon@i2pmail.org>\n"
+"POT-Creation-Date: 2010-11-08 18:21+0000\n"
+"PO-Revision-Date: 2010-11-09 01:52+0100\n"
+"Last-Translator: mixxy <m1xxy@mail.i2p>\n"
 "Language-Team: foo <foo@bar>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: German\n"

-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:199
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:200
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:193
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:197
 msgid "Search"
 msgstr "Suche"

-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:203
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:204
 msgid "Search within filtered list"
-msgstr "Suche in gefilterte Liste"
+msgstr "Suche in gefilterter Liste"

-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:205
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:206
 msgid "Filtered list"
 msgstr "Gefilterte Liste"

-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:209
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:210
 msgid "no matches"
 msgstr "Keine Übereinstimmungen"

-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:212
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:213
 msgid "Addressbook"
 msgstr "Adressbuch"

-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:214
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:215
 msgid "contains no entries"
 msgstr "enthält keine Einträge"

-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:216
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:217
 msgid "contains 1 entry"
 msgstr "enthält 1 Eintrag"

-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:218
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:219
 #, java-format
 msgid "contains {0} entries"
 msgstr "enthält {0} Einträge"

-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:228
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:229
 #, java-format
 msgid "Showing {0} of {1}"
 msgstr "Zeige {0} von {1}"

-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:259
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:260
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:368
 msgid "Add"
 msgstr "Hinzufügen"

-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:259
-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:264
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:260
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:265
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:366
 msgid "Replace"
 msgstr "Ersetzen"

-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:263
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:264
 #, java-format
 msgid "Host name {0} is already in addressbook, unchanged."
 msgstr "Hostname {0} ist bereits im Adressbuch, nicht geändert."

-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:265
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:266
 #, java-format
 msgid "Host name {0} is already in addressbook with a different destination. Click \"Replace\" to overwrite."
-msgstr "Hostname {0} ist bereits im Adressbuch mit einem anderen Ziel. Klicken Sie auf \"Ersetzen\" um den alten Eintrag zu ersetzen."
+msgstr "Hostname {0} ist mit einem anderen Ziel bereits im Adressbuch. Klicken Sie auf \"Ersetzen\", um den alten Eintrag zu ersetzen!"

-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:277
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:278
 #, java-format
 msgid "Destination added for {0}."
 msgstr "Ziel hinzugefügt für {0}"

-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:279
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:280
 #, java-format
 msgid "Destination changed for {0}."
 msgstr "Ziel geändert für {0}"

-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:284
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:285
 msgid "Invalid Base 64 destination."
 msgstr "Ungültiges Basis-64 Ziel"

-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:288
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:289
 msgid "Please enter a host name and destination"
-msgstr "Bitte geben Sie einen Hostnamen und ein Ziel ein"
+msgstr "Bitte geben Sie einen Hostnamen und ein Ziel ein!"

-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:292
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:293
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:314
 msgid "Delete Selected"
 msgstr "Ausgewähltes löschen"

-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:302
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:303
 #, java-format
 msgid "Destination {0} deleted."
-msgstr "Ziel {0} gelöscht."
+msgstr "Ziel {0} gelöscht"

-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:304
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:305
 #, java-format
 msgid "{0} destinations deleted."
-msgstr "{0} Ziele gelöscht."
+msgstr "{0} Ziele gelöscht"

-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:310
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:311
 msgid "Addressbook saved."
-msgstr "Adressbuch gespeichert."
+msgstr "Adressbuch gespeichert"

-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:313
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:314
 msgid "ERROR: Could not write addressbook file."
 msgstr "FEHLER: Konnte Adressbuchdatei nicht schreiben."

-#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:318
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:319
 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:148
-#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:150
+#: ../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 "Ungültige Datenübertragung, vielleicht haben Sie die \"Zurück\" oder \"Neu laden\" Schalter in ihrem Browser genutzt. Bitte neu senden."
+msgstr "Ungültige Datenübertragung, vielleicht haben Sie die \"Zurück\"- oder \"Neu laden\"-Schalter in Ihrem Browser genutzt. Bitte neu senden!"

 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:139
-#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:129
+#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:130
 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:130
 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:130
 msgid "Save"
@ -134,10 +134,10 @@ msgstr "Speichern"

 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:141
 msgid "Configuration saved."
-msgstr "Einstellungen gespeichert."
+msgstr "Einstellungen gespeichert"

 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:142
-#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:144
+#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:145
 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:128
 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:128
 msgid "Reload"
@ -145,24 +145,24 @@ msgstr "Neu laden"

 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:144
 msgid "Configuration reloaded."
-msgstr "Einstellungen neu geladen."
+msgstr "Einstellungen neu geladen"

 #. Yes this is a hack.
 #. No it doesn't work on a text-mode browser.
 #. Fetching from the addressbook servlet
 #. with the correct parameters will kick off a
 #. config reload and fetch.
-#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:138
+#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:139
 msgid "Subscriptions saved, updating addressbook from subscription sources now."
-msgstr "Abonnement gespeichert, aktualisiere jetzt das Adressbuch von unten stehenden Aboquellen."
+msgstr "Abonnement gespeichert, aktualisiere jetzt das Adressbuch von untenstehenden Aboquellen."

-#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:142
+#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:143
 msgid "Subscriptions saved."
-msgstr "Abonnementquellen gespeichert."
+msgstr "Abonnementquellen gespeichert"

-#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:146
+#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:147
 msgid "Subscriptions reloaded."
-msgstr "Abonnementquellen neu geladen."
+msgstr "Abonnementquellen neu geladen"

 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:125
 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:145
@ -254,7 +254,7 @@ msgstr "Ziel"

 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:257
 msgid "Mark for deletion"
-msgstr "zum löschen markieren"
+msgstr "zum Löschen markieren"

 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:279
 msgid "address helper link"
@ -282,23 +282,23 @@ msgstr "Hinweise"

 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:134
 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 "Dateien und Verzeichnispfade sind relativ zum Arbeitsverzeichnis des Adressbuches, normalerweise ~/.i2p/addressbook/ (Linux) oder %APPDATA%\\I2P\\addressbook\\ (Windows)."
+msgstr "Dateien und Verzeichnispfade sind relativ zum Arbeitsverzeichnis des Adressbuchs - normalerweise ~/.i2p/addressbook/ (Linux) oder %APPDATA%\\I2P\\addressbook\\ (Windows)."

 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:136
 msgid "If you want to manually add lines to an addressbook, add them to the private or master addressbooks."
-msgstr "Falls Sie manuell Einträge zum Adressbuch hinzufügen möchten, fügen Sie diese zum Privaten oder zum Master Adressbuch hinzu."
+msgstr "Falls Sie manuell Einträge zum Adressbuch hinzufügen möchten, fügen Sie diese zum privaten oder zum Master-Adressbuch hinzu!"

 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:138
 msgid "The router addressbook and the published addressbook are updated by the addressbook application."
-msgstr "Das Router Adressbuch und das veröffentlichte Adressbuch werden von der Adressbuch Anwendung aktualisiert."
+msgstr "Das Router-Adressbuch und das veröffentlichte Adressbuch werden von der Adressbuch-Anwendung aktualisiert."

 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:140
 msgid "When you publish your addressbook, ALL destinations from the master and router addressbooks appear there."
-msgstr "Falls Sie das Adressbuch veröffentlichen erscheinen dort ALLE Ziele aus dem Master und dem Router Adressbuch."
+msgstr "Falls Sie das Adressbuch veröffentlichen, erscheinen dort ALLE Ziele aus dem Master- und dem Router-Adressbuch."

 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:142
 msgid "Use the private addressbook for private destinations, these are not published."
-msgstr "Benutzen Sie das private Adressbuch für private Ziele, diese werden nicht veröffentlicht."
+msgstr "Benutzen Sie das private Adressbuch für private Ziele. Diese werden nicht veröffentlicht."

 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:144
 msgid "Options"
@ -306,15 +306,15 @@ msgstr "Optionen"

 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:146
 msgid "File containing the list of subscriptions URLs (no need to change)"
-msgstr "Datei mit der Liste von Abonnement-URLs (braucht nicht geändert werden)"
+msgstr "Datei mit der Liste von Abonnement-URLs (braucht nicht geändert zu werden)"

 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:148
 msgid "Update interval in hours"
-msgstr "Update Intervall in Stunden"
+msgstr "Aktualisierungsintervall in Stunden"

 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:150
 msgid "Your public hosts.txt file (choose a path within your webserver document root)"
-msgstr "Ihre öffentliche hosts.txt datei (Wählen Sie einen Pfad in ihrem Webserver Wurzelverzeichnis)"
+msgstr "Ihre öffentliche hosts.txt-Datei (Wählen Sie einen Pfad in Ihrem Webserver Wurzelverzeichnis!)"

 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:152
 msgid "Your hosts.txt (don't change)"
@ -322,27 +322,27 @@ msgstr "Ihre hosts.txt (nicht ändern)"

 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:154
 msgid "Your personal addressbook, these hosts will be published"
-msgstr "Ihr persönliches Adressbuch, diese Hosteinträge werden veröffentlicht"
+msgstr "Ihr persönliches Adressbuch - diese Hosteinträge werden veröffentlicht"

 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:156
 msgid "Your private addressbook, it is never published"
-msgstr "Ihr privates Adressbuch, dieses wird nie veröffentlicht"
+msgstr "Ihr privates Adressbuch - dieses wird nie veröffentlicht"

 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:158
 msgid "Port for your eepProxy (no need to change)"
-msgstr "Port zu Ihrem EepProxy (braucht nicht geändert werden)"
+msgstr "Port zu Ihrem EepProxy (braucht nicht geändert zu werden)"

 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:160
 msgid "Hostname for your eepProxy (no need to change)"
-msgstr "Hostname zu Ihrem EepProxy (braucht nicht geändert werden)"
+msgstr "Hostname zu Ihrem EepProxy (braucht nicht geändert zu werden)"

 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:162
 msgid "Whether to update the published addressbook"
-msgstr "Ob ihr veröffentlichtes Adressbuch aktualisiert werden soll"
+msgstr "Soll Ihr veröffentlichtes Adressbuch aktualisiert werden?"

 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:164
 msgid "File containing the etags header from the fetched subscription URLs (no need to change)"
-msgstr "Datei,die die etags-Kopfzeilen der bereits aktualisierten Abonnement URLs enthält (braucht nicht geändert werden)"
+msgstr "Datei, die die etags-Kopfzeilen der bereits aktualisierten Abonnement-URLs enthält (braucht nicht geändert zu werden)"

 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:166
 msgid "File containing the modification timestamp for each fetched subscription URL (no need to change)"
@ -350,11 +350,11 @@ msgstr "Datei, welche die Zeitstempel der letzten Modifikation für jede bereits

 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:168
 msgid "File to log activity to (change to /dev/null if you like)"
-msgstr "Berichte zu Aktivitäten werden in dieser Datei gespeichert (ändern Sie es zu /dev/null falls Sie möchten)"
+msgstr "Berichte zu Aktivitäten werden in dieser Datei gespeichert. (Ändern Sie es zu /dev/null, wenn Sie möchten!)"

 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:91
 msgid "Introduction"
-msgstr "Einleittng - SusiDNS"
+msgstr "Einleitung - SusiDNS"

 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:109
 msgid "What is the addressbook?"
@ -362,11 +362,11 @@ msgstr "Was ist das Adressbuch?"

 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:111
 msgid "The addressbook application is part of your i2p installation."
-msgstr "Das Adressbuch ist ein Teil Ihrer I2P Installation."
+msgstr "Das Adressbuch ist ein Teil Ihrer I2P-Installation."

 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:113
 msgid "It regularly updates your hosts.txt file from distributed sources or \"subscriptions\"."
-msgstr "Es aktualisiert regelmässig Ihre hosts.txt Datei aus verteilten Quellen oder den \"Abonnementquellen\"."
+msgstr "Es aktualisiert regelmäßig Ihre hosts.txt-Datei aus verteilten Quellen oder den \"Abonnementquellen\"."

 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:115
 msgid "In the default configuration, the addressbook is only subscribed to www.i2p2.i2p."
@ -374,11 +374,11 @@ msgstr "In der Standardeinstellung bezieht das Adressbuch sein Abonnement nur vo

 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:117
 msgid "Subscribing to additional sites is easy, just add them to your <a href=\"subscriptions.jsp\">subscriptions</a> file."
-msgstr "Zusätzliche Abonnementquellen hinzufügen ist einfach, fügen Sie deren URL zu Ihrer <a href=\"subscriptions.jsp\">Abonnement</a> Datei hinzu."
+msgstr "Zusätzliche Abonnementquellen hinzuzufügen ist einfach: Geben Sie dazu deren URL in Ihrer <a href=\"subscriptions.jsp\">Abonnement</a>-Datei an."

 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:119
 msgid "For more information on naming in i2p, see <a href=\"http://www.i2p2.i2p/naming.html\">the overview on www.i2p2.i2p</a>."
-msgstr "Für mehr Informationen über das Namenssystem in I2P schauen Sie bitte auf der <a href=\"http://www.i2p2.i2p/naming.html\">&Uuml;bersichtsseite auf www.i2p2.i2p</a> nach."
+msgstr "Für mehr Informationen über das Namenssystem in I2P konsultieren Sie bitte die <a href=\"http://www.i2p2.i2p/naming.html\">&Uuml;bersichtsseite auf www.i2p2.i2p</a>."

 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:121
 msgid "How does the addressbook work?"
@ -386,15 +386,15 @@ msgstr "Wie funktioniert das Adressbuch?"

 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:123
 msgid "The addressbook application regularly polls your subscriptions and merges their content into your \"router\" addressbook, stored in the hosts.txt file."
-msgstr "Die Adressbuch-Anwendung bezieht regelmässig ihre Abonnements und fügt deren Inhalt in Ihr \"Router\" Adressbuch zusammen, gespeichert in der hosts.txt Datei."
+msgstr "Die Adressbuch-Anwendung bezieht regelmäßig ihre Abonnements und führt deren Inhalt mit dem Ihres \"Router\"-Adressbuchs zusammen, welches in der hosts.txt-Datei gespeichert ist."

 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:125
 msgid "Then it merges your \"master\" addressbook (userhosts.txt) into the router addressbook as well."
-msgstr "Dann fügt diese auch Ihr \"Master\" Adressbuch (userhosts.txt) dem Router Adressbuch hinzu."
+msgstr "Dann fügt sie auch Ihr \"Master\"-Adressbuch (userhosts.txt) dem Router-Adressbuch hinzu."

 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:127
 msgid "If configured, the router addressbook is now written to the \"published\" addressbook, which will be publicly available if you are running an eepsite."
-msgstr "Falls eingestellt wird das Router Adressbuch jetzt in das \"veröffentlichte\" Adressbuch kopiert, dieses ist öffentlich erreichbar sobald Sie eine Eepseite aktiv haben."
+msgstr "Falls eingestellt, wird das Router-Adressbuch jetzt in das \"veröffentlichte\" Adressbuch kopiert. Dieses ist öffentlich erreichbar, solange Sie eine Eepseite betreiben."

 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:129
 msgid "The router also uses a private addressbook (privatehosts.txt, not shown in the picture), which is not merged or published."
@ -406,29 +406,29 @@ msgstr "Hosts in Ihrem privatem Adressbuch können von Ihnen aufgerufen werden,

 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:133
 msgid "The private addressbook can also be used for aliases of hosts in your other addressbooks."
-msgstr "Das private Adressbuch kann auch für Verweise auf Hosts in ihren anderen Adressbüchern genutzt werden."
+msgstr "Das private Adressbuch kann auch für Verweise auf Hosts in Ihren anderen Adressbüchern genutzt werden."

 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:132
 msgid "The subscription file contains a list of i2p URLs."
-msgstr "Die Abonnementdatei enthält eine Liste von I2P URLs."
+msgstr "Die Abonnementdatei enthält eine Liste von I2P-URLs."

 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:134
 msgid "The addressbook application regularly checks this list for new eepsites."
-msgstr "Die Adressbuchanwendung prüft diese Liste regelmässig auf neue Eepsites."
+msgstr "Die Adressbuchanwendung prüft diese Liste regelmäßig auf neue Eepsites."

 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:136
 msgid "Those URLs refer to published hosts.txt files."
-msgstr "Diese URLs verweisen auf veröffentlichte hosts.txt Dateien."
+msgstr "Diese URLs verweisen auf veröffentlichte hosts.txt-Dateien."

 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:138
 msgid "The default subscription is the hosts.txt from www.i2p2.i2p, which is updated infrequently."
-msgstr "Das standard Abonnement ist die hosts.txt Datei von www.i2p2.i2p, welche nicht regelmässig aktualisiert wird."
+msgstr "Das Standardabonnement ist die hosts.txt-Datei von www.i2p2.i2p, welche nicht regelmäßig aktualisiert wird."

 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:140
 msgid "So it is a good idea to add additional subscriptions to sites that have the latest addresses."
-msgstr "Somit ist es eine gute Idee weitere Abonnement von Seiten mit den neuesten Adressen hinzuzufügen."
+msgstr "Somit ist es eine gute Idee, weitere Abonnements von Seiten mit den neuesten Adressen hinzuzufügen."

 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:142
 msgid "See the FAQ for a list of subscription URLs."
-msgstr "Schauen Sie in den FAQ nach einer Liste von Abonnement-URLs."
+msgstr "Schauen Sie in den FAQ nach einer Liste von Abonnement-URLs!"

--- a/build.xml
+++ b/build.xml
@ -37,6 +37,8 @@
        <echo message="  javadoc:   generate javadoc for the entire project into ./build/javadoc" />
        <echo message="  slackpkg:  generate Slackware packages in ./Slackware/i2p and ./Slackware/i2p-base" />
        <echo message="  debianhowto: instructions on building Debian packages" />
+        <echo message="  debian: generate Debian packages (source + binary)" />
+        <echo message="  debianrepo: build a Debian repository (reprepro required)" />
        <echo message="  updaterWithDesktopgui: tar the built files and desktopgui in an i2pupdate.zip" />
        <echo message="  pkgWithDesktopgui: distclean then package everything up with the desktopgui" />
        <echo message="  distWithDesktopgui: pkgWithDesktopgui and javadoc" />
@ -157,12 +159,34 @@
    <target name="javadoc">
        <mkdir dir="./build" />
        <mkdir dir="./build/javadoc" />
+        <!-- get release and build version numbers -->
+        <exec executable="grep" outputproperty="versionLine" >
+            <arg value="public final static String VERSION" />
+	    <arg value="core/java/src/net/i2p/CoreVersion.java" />
+        </exec>
+        <exec executable="cut" inputstring="${versionLine}" outputproperty="release.number" >
+            <arg value="-f2" />
+	    <arg value="-d&quot;" />
+        </exec>
+        <exec executable="grep" outputproperty="buildLine" >
+            <arg value="public final static long BUILD" />
+	    <arg value="router/java/src/net/i2p/router/RouterVersion.java" />
+        </exec>
+        <exec executable="cut" inputstring="${buildLine}" outputproperty="build.temp" >
+            <arg value="-f2" />
+	    <arg value="-d=" />
+        </exec>
+        <exec executable="cut" inputstring="${build.temp}" outputproperty="build.number" >
+            <arg value="-f1" />
+	    <arg value="-d;" />
+        </exec>
        <javadoc access="package" 
            destdir="./build/javadoc" 
            packagenames="*" 
            use="true" 
            splitindex="true" 
-            windowtitle="I2P Anonymous Network - Java Documentation">
+            doctitle="I2P Javadocs for Release ${release.number} Build ${build.number}"
+            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.*:freenet.support.CPUInformation:org.bouncycastle.crypto:org.bouncycastle.crypto.*:gnu.crypto.*:gnu.gettext:org.xlattice.crypto.filters:com.nettgryppa.security" />
            <group title="Streaming Library" packages="net.i2p.client.streaming" />
            <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:org.cybergarage.*:org.freenetproject" />
@ -200,6 +224,9 @@
                <pathelement location="installer/lib/wrapper/win32/wrapper.jar" />
                <pathelement location="core/lib/junit.jar" />                
            </classpath>
+            <link offline="true" href="http://download.oracle.com/javase/6/docs/api/" packagelistLoc="installer/resources/package-lists/java/" />
+            <link offline="true" href="http://docs.i2p2.de/jetty/javadoc/" packagelistLoc="installer/resources/package-lists/jetty/" />
+            <link offline="true" href="http://docs.i2p2.de/jrobin/javadoc/" packagelistLoc="installer/resources/package-lists/jrobin/" />
        </javadoc>
    </target>
    <target name="clean" depends="pkgclean" >
@ -212,7 +239,14 @@
    </target>
    <target name="distclean" depends="clean">
        <delete dir="debian/tmp" />
+        <delete dir="debian/repo" />
+        <delete dir="debian/db" />
        <delete file="debian/files" />
+        <delete file="debian/build" />
+        <delete file="debian/substvars"/>
+        <delete>
+            <fileset dir=".." includes="i2p_*.tar.gz,i2p_*.deb,i2p_*.dsc,i2p_*.changes" />
+        </delete>
        <ant dir="core/java/" target="distclean" />
        <ant dir="router/java/" target="distclean" />
        <ant dir="apps/ministreaming/java/" target="distclean" />
@ -889,6 +923,35 @@
    </target>

    <target name="debian">
+        <!-- same as debian-binary + debian-source, but only one build needed -->
+        <echo message="Did you update the version in these files?" />
+        <exec executable="ls" failonerror="true">
+            <arg value="-l" />
+            <arg value="debian/changelog" />
+        </exec>
+        <echo message="====================" />
+        <!-- bundle the 20MB jetty 5 lib since there probably isn't a deb for it -->
+        <ant dir="apps/jetty" target="ensureJettylib" />
+        <exec executable="dpkg-buildpackage" failifexecutionfails="true">
+            <arg value="-I_MTN" />
+            <arg value="-ai386" />
+        </exec>
+        <!-- rather than doing a complete new build, recreate debian/tmp by calling the "build" target in debian/rules -->
+        <delete dir="debian/tmp" />
+        <exec executable="dpkg-buildpackage" failifexecutionfails="true">
+            <arg value="-I_MTN" />
+            <arg value="-Tbuild" />
+            <arg value="-aamd64" />
+            <env key="MAKEFLAGS" value="-B" />
+        </exec>
+        <exec executable="dpkg-buildpackage" failifexecutionfails="true">
+            <arg value="-I_MTN" />
+            <!-- don't clean so the previous package isn't deleted -->
+            <arg value="-nc" />
+            <arg value="-aamd64" />
+        </exec>
+    </target>
+    <target name="debian-binary">
        <!-- binary only -->
        <echo message="Did you update the version in these files?" />
        <exec executable="ls" failonerror="true">
@ -902,7 +965,7 @@
    </target>
    <target name="debian-source">
        <!-- bundle the 20MB jetty 5 lib since there probably isn't a deb for it -->
-        <ant dir="apps/jetty" target="verifyJettylib" />
+        <ant dir="apps/jetty" target="ensureJettylib" />
        <echo message="Did you update the version in these files?" />
        <exec executable="ls" failonerror="true">
            <arg value="-l" />
@ -914,6 +977,9 @@
            <arg value="-I_MTN" />
        </exec>
    </target>
+    <target name="debianrepo" depends="debian">
+        <exec dir="debian" executable="./makerepo.sh" failonerror="true"/>
+    </target>

 <!-- the following are appened to help build barebone portable version, 
     none of the above is modified for this purpose -->
--- a/core/java/src/net/i2p/CoreVersion.java
+++ b/core/java/src/net/i2p/CoreVersion.java
@ -16,7 +16,7 @@ package net.i2p;
 public class CoreVersion {
    /** deprecated */
    public final static String ID = "Monotone";
-    public final static String VERSION = "0.8";
+    public final static String VERSION = "0.8.1";

    public static void main(String args[]) {
        System.out.println("I2P Core version: " + VERSION);
--- a/core/java/src/net/i2p/client/I2PClient.java
+++ b/core/java/src/net/i2p/client/I2PClient.java
@ -45,7 +45,7 @@ public interface I2PClient {
     * the router how to handle the new session, and to configure the end to end
     * encryption.
     * @param destKeyStream location from which to read the Destination, PrivateKey, and SigningPrivateKey from
-     * @param options set of options to configure the router with
+     * @param options set of options to configure the router with, if null will use System properties
     * @return new session allowing a Destination to recieve all of its messages and send messages to any other Destination.
     */
    public I2PSession createSession(InputStream destKeyStream, Properties options) throws I2PSessionException;
--- a/core/java/src/net/i2p/client/I2PClientImpl.java
+++ b/core/java/src/net/i2p/client/I2PClientImpl.java
@ -67,14 +67,14 @@ class I2PClientImpl implements I2PClient {

    /**
     * Create a new session (though do not connect it yet)
-     *
+     * @param options set of options to configure the router with, if null will use System properties
     */
    public I2PSession createSession(InputStream destKeyStream, Properties options) throws I2PSessionException {
        return createSession(I2PAppContext.getGlobalContext(), destKeyStream, options);
    }
    /**
     * Create a new session (though do not connect it yet)
-     *
+     * @param options set of options to configure the router with, if null will use System properties
     */
    public I2PSession createSession(I2PAppContext context, InputStream destKeyStream, Properties options) throws I2PSessionException {
        return new I2PSessionMuxedImpl(context, destKeyStream, options); // thread safe and muxed
--- a/core/java/src/net/i2p/client/I2PSessionImpl.java
+++ b/core/java/src/net/i2p/client/I2PSessionImpl.java
@ -137,6 +137,7 @@ 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
     *
+     * @param options set of options to configure the router with, if null will use System properties
     * @throws I2PSessionException if there is a problem loading the private keys or 
     */
    public I2PSessionImpl(I2PAppContext context, InputStream destKeyStream, Properties options) throws I2PSessionException {
@ -543,6 +544,7 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa

    /**
     * Retrieve the configuration options
+     * @return non-null, if insantiated with null options, this will be the System properties.
     */
    Properties getOptions() { return _options; }

--- a/core/java/src/net/i2p/client/I2PSessionImpl2.java
+++ b/core/java/src/net/i2p/client/I2PSessionImpl2.java
@ -49,6 +49,7 @@ class I2PSessionImpl2 extends I2PSessionImpl {
     * Create a new session, reading the Destination, PrivateKey, and SigningPrivateKey
     * from the destKeyStream, and using the specified options to connect to the router
     *
+     * @param options set of options to configure the router with, if null will use System properties
     * @throws I2PSessionException if there is a problem loading the private keys or 
     */
    public I2PSessionImpl2(I2PAppContext ctx, InputStream destKeyStream, Properties options) throws I2PSessionException {
@ -56,7 +57,7 @@ class I2PSessionImpl2 extends I2PSessionImpl {
        _log = ctx.logManager().getLog(I2PSessionImpl2.class);
        _sendingStates = new HashSet(32);
        // default is BestEffort
-        _noEffort = "none".equalsIgnoreCase(options.getProperty(I2PClient.PROP_RELIABILITY));
+        _noEffort = "none".equalsIgnoreCase(getOptions().getProperty(I2PClient.PROP_RELIABILITY));

        ctx.statManager().createRateStat("i2cp.sendBestEffortTotalTime", "how long to do the full sendBestEffort call?", "i2cp", new long[] { 10*60*1000 } );
        //ctx.statManager().createRateStat("i2cp.sendBestEffortStage0", "first part of sendBestEffort?", "i2cp", new long[] { 10*60*1000 } );
--- a/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java
+++ b/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java
@ -67,6 +67,9 @@ import net.i2p.util.SimpleScheduler;
 class I2PSessionMuxedImpl extends I2PSessionImpl2 implements I2PSession {
    private I2PSessionDemultiplexer _demultiplexer;

+    /*
+     * @param options set of options to configure the router with, if null will use System properties
+     */
    public I2PSessionMuxedImpl(I2PAppContext ctx, InputStream destKeyStream, Properties options) throws I2PSessionException {
        super(ctx, destKeyStream, options);
        // also stored in _sessionListener but we keep it in _demultipexer
--- a/core/java/src/net/i2p/client/naming/LookupDest.java
+++ b/core/java/src/net/i2p/client/naming/LookupDest.java
@ -67,6 +67,10 @@ class LookupDest {
    }

    public static void main(String args[]) {
-        System.out.println(lookupBase32Hash(I2PAppContext.getGlobalContext(), args[0]));
+        Destination dest = lookupBase32Hash(I2PAppContext.getGlobalContext(), args[0]);
+        if (dest == null)
+            System.out.println("Destination not found!");
+        else
+            System.out.println(dest.toBase64());
    }
 }
--- a/core/java/src/net/i2p/util/ByteCache.java
+++ b/core/java/src/net/i2p/util/ByteCache.java
@ -102,7 +102,7 @@ public final class ByteCache {
    public static void clearAll() {
        for (ByteCache bc : _caches.values())
            bc.clear();
-        I2PAppContext.getGlobalContext().logManager().getLog(ByteCache.class).error("WARNING: Low memory, clearing byte caches");
+        I2PAppContext.getGlobalContext().logManager().getLog(ByteCache.class).warn("WARNING: Low memory, clearing byte caches");
    }

    private Log _log;
--- a/core/java/src/net/i2p/util/SecureFileOutputStream.java
+++ b/core/java/src/net/i2p/util/SecureFileOutputStream.java
@ -25,8 +25,7 @@ public class SecureFileOutputStream extends FileOutputStream {
    }

    /**
-     *  Sets output file to mode 600 only if append = false
-     *  (otherwise it is presumed to be 600 already)
+     *  Sets output file to mode 600 whether append = true or false
     */
    public SecureFileOutputStream(String file, boolean append) throws FileNotFoundException {
        super(file, append);
--- a/debian/README.txt
+++ b/debian/README.txt
@ -2,7 +2,7 @@ This sets up a binary package with the following:

 - A new user i2psvc (a lot of people already have an i2p user)
 - i2psvc home is /var/lib/i2p
- $I2P is /usr/lib/i2p, owned by i2psvc
+- $I2P is /usr/share/i2p, owned by i2psvc
 - i2psvc router directory is /var/lib/i2p/i2p-config (hack in WorkingDir.java)
 - i2p daemon script in /etc/init.d/i2p
 - i2prouter and eepget scripts in /usr/bin for other users to run it
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,8 @@
+i2p (0.8.0-1) all; urgency=low
+  * I2P 0.8
+  * Debian packaging improvements
+ -- Hungry Hobo <HungryHobo@i2pmail.org>  Mon, 08 Nov 2010 17:14:57 +0000
+
 i2p (0.7.10-0) testing; urgency=low
  * tweaks
    um...
--- a/debian/conffiles
+++ b/debian/conffiles
@ -0,0 +1,9 @@
+/etc/init.d/i2p
+/etc/i2p/blocklist.txt
+/etc/i2p/clients.config
+/etc/i2p/hosts.txt
+/etc/i2p/i2psnark.config
+/etc/i2p/i2ptunnel.config
+/etc/i2p/jetty-i2psnark.xml
+/etc/i2p/systray.config
+/etc/i2p/wrapper.config
--- a/debian/control
+++ b/debian/control
@ -1,15 +1,16 @@
 Source: i2p
-Maintainer: i2p
+Maintainer: Hungry Hobo <HungryHobo@i2pmail.org>
 Section: net
+Standards-Version: 3.8.4
 Priority: optional
 Homepage: http://www.i2p2.de/
-Build-Depends: java-sdk, ant, gettext
+Build-Depends: libc6-dev (>= 2.10), sun-java6-jdk | openjdk-6-jdk | default-jdk | java-sdk, ant, fakeroot, gettext

 Package: i2p
-Architecture: all
+Architecture: i386 amd64
 Section: net
 Priority: optional
-Depends: sun-java6-jre | default-jre | java-runtime
+Depends: ${shlibs:Depends}, sun-java6-jre | default-jre | java-runtime
 Description: Load-balanced unspoofable packet switching network
 I2P is an anonymizing network, offering a simple layer that identity-sensitive
 applications can use to securely communicate. All data is wrapped with several
--- a/debian/copyright
+++ b/debian/copyright
@ -1,8 +0,0 @@
-everything is released according to the 
-terms of the I2P license policy.  For the I2P SDK, 
-that means everything contained within this
-module is released into the public domain unless
-otherwise marked.  Alternate licenses that may be
-used include BSD (used by thecrypto's DSA, ElGamal,
-and SHA256 implementations), Cryptix (used by cryptix's
-AES implementation), and MIT.
--- a/debian/copyright.part1
+++ b/debian/copyright.part1
@ -0,0 +1,11 @@
+This is the Debian package of I2P. The latest version of I2P can always be found at:
+	http://www.i2p2.de/
+
+I2P was originally developed by jrandom and others. The main developer now is zzz.
+See http://www.i2p2.de/team for a list of past and present developers.
+
+I2P is maintained in Monotone. The current development version may be checked out
+by issuing the following two commands:
+	mtn --db i2p.mtn dn init
+	mtn --db i2p.mtn co mtn.i2p2.de i2p.i2p
+
--- a/debian/makerepo.sh
+++ b/debian/makerepo.sh
@ -0,0 +1,42 @@
+#!/bin/bash
+# This script creates a Debian repository in ${DIR} using the reprepro tool.
+# The packages are signed with the key referenced in the newest changelog entry.
+
+set -e
+
+cd $(dirname $0)
+DIR=./repo
+CONFDIR=conf
+CONFFILE=${CONFDIR}/distributions
+
+SIGNER=`parsechangelog --file changelog | grep Maintainer | cut -d: -f2`
+SIGNER=${SIGNER//^ /}
+SIGNER=`echo ${SIGNER} | cut -d\  -f1`
+KEYID=`gpg --list-keys "${SIGNER}" | cut -d: -f2 | grep -w pub | cut -d/ -f2 | cut -d\  -f1`
+echo Using signing key: ${SIGNER}
+echo Key ID: ${KEYID}
+
+# creating the reprepro config file dynamically allows us to specify the signer
+mkdir -p ${CONFDIR}
+echo "Origin: I2P" > ${CONFFILE}
+echo "Label: I2P Debian Repository" >> ${CONFFILE}
+echo "Suite: all" >> ${CONFFILE}
+echo "Codename: all" >> ${CONFFILE}
+echo "Architectures: i386 amd64 source" >> ${CONFFILE}
+echo "Components: main" >> ${CONFFILE}
+echo "SignWith: ${SIGNER}" >> ${CONFFILE}
+
+# create the repository
+echo Building the repository...
+find ../.. -name i2p_*.deb -maxdepth 1 -exec reprepro --ask-passphrase --outdir ${DIR} includedeb all {} \;
+find ../.. -name i2p_*.changes -maxdepth 1 -exec reprepro --ask-passphrase --outdir ${DIR} include all {} \;
+
+# export the public key
+gpg --armor --export ${SIGNER} > ${DIR}/0x${KEYID}.asc
+
+# remove the config file created above
+echo Cleaning up...
+rm -f ${CONFFILE}
+rmdir ${CONFDIR}
+
+echo Debian repository created in `pwd`/${DIR}.
--- a/debian/rules
+++ b/debian/rules
@ -3,33 +3,122 @@
 VERSION=`grep String\ VERSION core/java/src/net/i2p/CoreVersion.java | cut -d\" -f2`
 SOURCEURL=http://mirror.i2p2.de/i2psource_${VERSION}.tar.bz2

+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+ifeq ($(DEB_HOST_ARCH),i386)
+wrapperpath = installer/lib/wrapper/linux
+else ifeq ($(DEB_HOST_ARCH),amd64)
+wrapperpath = installer/lib/wrapper/linux64
+# other architectures could be supported by using runplain.sh
+endif
+
 build:
+	echo Target Architecture is $(DEB_HOST_ARCH)
+ifndef wrapperpath
+	@echo "Architecture not supported: $(DEB_HOST_ARCH)"
+	exit 1
+endif
 	ant preppkg-linux-only
-	mkdir -p debian/tmp/usr/lib
+	
 	mkdir -p debian/tmp/etc/init.d
-	cp -a debian/scripts/init debian/tmp/etc/init.d/i2p
-	cp -a pkg-temp debian/tmp/usr/lib/i2p
-	chmod +x debian/tmp/usr/lib/i2p/postinstall.sh
-	sed 's|$$INSTALL_PATH|/usr/lib/i2p|g' debian/tmp/usr/lib/i2p/wrapper.config > debian/tmp/usr/lib/i2p/a
-	sed 's|$$SYSTEM_java_io_tmpdir|/tmp|g' debian/tmp/usr/lib/i2p/a > debian/tmp/usr/lib/i2p/wrapper.config
+	mkdir -p debian/tmp/etc/i2p
+	mkdir -p debian/tmp/usr/share/i2p/lib
+	mkdir -p debian/tmp/usr/share/doc/i2p
+	mkdir -p debian/tmp/usr/share/man/man1
+	mkdir -p debian/tmp/usr/lib/i2p
 	mkdir -p debian/tmp/usr/bin
-	sed 's|%INSTALL_PATH|/usr/lib/i2p|g' debian/tmp/usr/lib/i2p/eepget > debian/tmp/usr/lib/i2p/a
-	mv debian/tmp/usr/lib/i2p/a debian/tmp/usr/lib/i2p/eepget
-	ln -s /usr/lib/i2p/eepget debian/tmp/usr/bin/eepget
-	sed 's|%INSTALL_PATH|/usr/lib/i2p|g' debian/tmp/usr/lib/i2p/runplain.sh > debian/tmp/usr/lib/i2p/a
-	sed 's|%SYSTEM_java_io_tmpdir|/tmp|g' debian/tmp/usr/lib/i2p/a > debian/tmp/usr/lib/i2p/runplain.sh
-	sed 's|%INSTALL_PATH|/usr/lib/i2p|g' debian/tmp/usr/lib/i2p/i2prouter > debian/tmp/usr/lib/i2p/a
-	sed 's|%SYSTEM_java_io_tmpdir|/tmp|g' debian/tmp/usr/lib/i2p/a > debian/tmp/usr/lib/i2p/i2prouter
-	ln -s /usr/lib/i2p/i2prouter debian/tmp/usr/bin/i2prouter
-	rm debian/tmp/usr/lib/i2p/a
+	
+	cp -a debian/scripts/init debian/tmp/etc/init.d/i2p
+	
+	@# copy config templates to /etc/i2p
+	cp -a pkg-temp/blocklist.txt debian/tmp/etc/i2p/
+	cp -a pkg-temp/clients.config debian/tmp/etc/i2p/
+	cp -a pkg-temp/hosts.txt debian/tmp/etc/i2p/
+	cp -a pkg-temp/i2psnark.config debian/tmp/etc/i2p/
+	cp -a pkg-temp/i2ptunnel.config debian/tmp/etc/i2p/
+	cp -a pkg-temp/jetty-i2psnark.xml debian/tmp/etc/i2p/
+	cp -a pkg-temp/systray.config debian/tmp/etc/i2p/
+	
+	@# copy architecture independent files to /usr/share/i2p and create symlinks to /etc/i2p/
+	ln -s /etc/i2p/blocklist.txt debian/tmp/usr/share/i2p/blocklist.txt
+	ln -s /etc/i2p/clients.config debian/tmp/usr/share/i2p/clients.config
+	ln -s /etc/i2p/hosts.txt debian/tmp/usr/share/i2p/hosts.txt
+	ln -s /etc/i2p/i2psnark.config debian/tmp/usr/share/i2p/i2psnark.config
+	ln -s /etc/i2p/i2ptunnel.config debian/tmp/usr/share/i2p/i2ptunnel.config
+	ln -s /etc/i2p/jetty-i2psnark.xml debian/tmp/usr/share/i2p/jetty-i2psnark.xml
+	ln -s /etc/i2p/systray.config debian/tmp/usr/share/i2p/systray.config
+	ln -s /etc/i2p/wrapper.config debian/tmp/usr/share/i2p/wrapper.config
+	cp -a pkg-temp/docs debian/tmp/usr/share/i2p/
+	cp -a pkg-temp/eepsite debian/tmp/usr/share/i2p/
+	cp -a pkg-temp/geoip debian/tmp/usr/share/i2p/
+	cp -a pkg-temp/lib/*.jar debian/tmp/usr/share/i2p/lib/
+	cp -a pkg-temp/scripts debian/tmp/usr/share/i2p/
+	cp -a pkg-temp/webapps debian/tmp/usr/share/i2p/
+	cp -a pkg-temp/licenses debian/tmp/usr/share/doc/i2p/
+	@# Create the Debian copyright file
+	cat debian/copyright.part1 LICENSE.txt > debian/tmp/usr/share/doc/i2p/copyright
+	@# delete all license files that are already in /usr/share/common-licenses/
+	rm debian/tmp/usr/share/doc/i2p/licenses/LICENSE-Apache2.0.txt
+	rm debian/tmp/usr/share/doc/i2p/licenses/LICENSE-GPLv2.txt
+	rm debian/tmp/usr/share/doc/i2p/licenses/LICENSE-LGPLv2.1.txt
+
+	@# man pages
+	gzip -9c installer/resources/man/eepget.1 > debian/tmp/usr/share/man/man1/eepget.1.gz
+	gzip -9c installer/resources/man/i2prouter.1 > debian/tmp/usr/share/man/man1/i2prouter.1.gz
+
+	@# copy wrapper files to /usr/lib/i2p (including wrapper.jar because it is architecture dependent)
+	cp ${wrapperpath}/libwrapper.so debian/tmp/usr/lib/i2p/
+	cp ${wrapperpath}/wrapper.jar debian/tmp/usr/lib/i2p/
+	cp ${wrapperpath}/i2psvc debian/tmp/usr/lib/i2p/
+	chmod +x debian/tmp/usr/lib/i2p/i2psvc
+	strip debian/tmp/usr/lib/i2p/libwrapper.so
+	strip debian/tmp/usr/lib/i2p/i2psvc
+
+	@# copy remaining executables to /usr/bin, replace INSTALL_PATH and SYSTEM_java_io_tmpdir
+	sed 's|%INSTALL_PATH|/usr/share/i2p|g' pkg-temp/eepget > debian/tmp/usr/bin/eepget
+	chmod +x debian/tmp/usr/bin/eepget
+	cat pkg-temp/i2prouter | \
+	    sed 's|$$I2P/i2psvc|/usr/lib/i2p/i2psvc|g' | \
+	    sed 's|$$I2P/wrapper.config|/etc/i2p/wrapper.config|g' | \
+	    sed 's|%INSTALL_PATH|/usr/share/i2p|g' | \
+	    sed 's|%SYSTEM_java_io_tmpdir|/tmp|g' > debian/tmp/usr/bin/i2prouter
+	chmod +x debian/tmp/usr/bin/i2prouter
+	@# The first 4 sed commands each replace the first \$INSTALL_PATH that hasn't been replaced
+	@# wrapper.java.classpath.1 --> /usr/share/i2p/lib/*.jar:/usr/lib/i2p/wrapper.jar
+	@# wrapper.java.library.path.1 --> /usr/lib/i2p
+	@# wrapper.java.library.path.2 --> /usr/lib/i2p
+	@# i2p.dir.base --> /usr/share/i2p
+	cat pkg-temp/wrapper.config | \
+	    sed '0,/$$INSTALL_PATH\/lib\/\*\.jar/s//\/usr\/share\/i2p\/lib\/*.jar\nwrapper.java.classpath.2=\/usr\/lib\/i2p\/wrapper.jar/' | \
+	    sed '0,/$$INSTALL_PATH/s//\/usr\/lib\/i2p/' | \
+	    sed '0,/$$INSTALL_PATH/s//\/usr\/lib\/i2p/' | \
+	    sed '0,/$$INSTALL_PATH/s//\/usr\/share\/i2p/' | \
+	    sed 's|$$SYSTEM_java_io_tmpdir|/tmp|g' > debian/tmp/etc/i2p/wrapper.config
+	@# now do runplain.sh
+	cat pkg-temp/runplain.sh | \
+	    sed 's|-Djava.library.path=$$I2P:$$I2P/lib|-Djava.library.path=/usr/lib/i2p|g' | \
+	    sed 's|%INSTALL_PATH|/usr/share/i2p|g' | \
+	    sed 's|%SYSTEM_java_io_tmpdir|/tmp|g' > debian/tmp/usr/share/i2p/runplain.sh
+	chmod +x debian/tmp/usr/share/i2p/runplain.sh
+	
+	dpkg-shlibdeps debian/tmp/usr/lib/i2p/libwrapper.so
+	dpkg-shlibdeps debian/tmp/usr/lib/i2p/i2psvc
+	
 	touch debian/build
 	
+	@# changelog
+	gzip -9c history.txt > debian/tmp/usr/share/doc/i2p/changelog.gz
+	gzip -9c debian/changelog > debian/tmp/usr/share/doc/i2p/changelog.Debian.gz
+
 binary: build
 	mkdir -p debian/tmp/DEBIAN
 	dpkg-gencontrol
-	cp -a debian/scripts/postinst debian/scripts/postrm debian/scripts/prerm debian/tmp/DEBIAN
+	cp -a debian/scripts/postinst debian/scripts/postrm debian/scripts/prerm debian/conffiles debian/tmp/DEBIAN
 	dpkg-deb -b debian/tmp ..

+binary-arch:
+
+binary-indep:
+
 clean:
 	rm -f debian/build
 	rm -rf debian/tmp/
--- a/debian/scripts/init
+++ b/debian/scripts/init
@ -5,7 +5,7 @@
 # Required-Start:	$remote_fs $syslog
 # Required-Stop:	$remote_fs $syslog
 # Default-Start:	
-# Default-Stop:		1 2 3 4 5
+# Default-Stop:		0 1 2 3 4 5 6
 # Short-Description:	I2P anonymizing mixnet
 ### END INIT INFO

@ -14,7 +14,7 @@ set -e
 . /lib/lsb/init-functions

 I2P () {
-	su i2psvc -c "/usr/lib/i2p/i2prouter $1"
+	su i2psvc -c "/usr/bin/i2prouter $1"
 }

 if [ `id -un` != "root" ]; then
@ -39,7 +39,7 @@ case "$1" in
 	    log_end_msg 1
 	fi
 	;;
-  restart)
+  restart|force-reload)
 	log_daemon_msg "Restarting I2P" "i2p"
 	if I2P restart; then
 	    log_end_msg 0
--- a/debian/scripts/postinst
+++ b/debian/scripts/postinst
@ -1,6 +1,8 @@
 #!/bin/sh
+set -e
+
 SVCHOME=/var/lib/i2p
-I2P=/usr/lib/i2p
+I2P=/usr/share/i2p
 I2PUSER=i2psvc

 useradd -d $SVCHOME -r $I2PUSER
@ -10,11 +12,4 @@ chown $I2PUSER:$I2PUSER $SVCHOME

 update-rc.d i2p defaults

-cd $I2P
-su $I2PUSER ./postinstall.sh
-
-chmod 755 /usr/lib/i2p/eepget
-chmod 755 /usr/lib/i2p/i2prouter
-chmod 755 /usr/lib/i2p/i2psvc
-
 invoke-rc.d i2p start
--- a/debian/scripts/postrm
+++ b/debian/scripts/postrm
@ -1,17 +1,19 @@
 #!/bin/sh
+set -e

-# $1 is either "remove" or "purge". Since there are no config
-# files left after a remove, exit here if called with "purge".
-# This avoids calling userdel again which would cause an error.
-if [ "$1" = "purge" ]; then
-	exit 0;
-fi
+# /etc/rc*.d/*i2p files	
+update-rc.d -f i2p remove

 I2PUSER=i2psvc
-exec userdel $I2PUSER
+# delete $I2PUSER if it exists (it will not if this is a purge after a remove)
+# the "| cat" sets the exit code to zero so the script doesn't abort
+entry=`getent passwd | cut -d: -f1 | grep i2psvc | cat`
+if [ -n "$entry" ]; then
+    exec userdel $I2PUSER
+fi

 # if somebody did updates in-network, there may be new files that dpkg
 # doesn't know about, so just to be sure
-I2P=/usr/lib/i2p
+I2P=/usr/share/i2p
 rm -rf $I2P

--- a/debian/scripts/prerm
+++ b/debian/scripts/prerm
@ -1,17 +1,15 @@
 #!/bin/sh
-/etc/init.d/i2p stop
+set -e
+
+invoke-rc.d i2p stop

 # stuff in /tmp
-rm -f /tmp/wrapper.log /tmp/wrapper.log.1 /tmp/wrapper.log.2 /tmp/i2p.pid /tmp/routerjvm.pid /tmp/router.ping
+TMPDIR=/tmp
+rm -f ${TMPDIR}/wrapper.log ${TMPDIR}/wrapper.log.1 ${TMPDIR}/wrapper.log.2 ${TMPDIR}/i2p.pid ${TMPDIR}/routerjvm.pid ${TMPDIR}/router.ping

-# /etc/rc*.d/*i2p files	
-update-rc.d -f i2p remove
-
-# dpkg doesn't know about these files, created by postinstall.sh
-I2P=/usr/lib/i2p
-rm -f $I2P/i2psvc $I2P/lib/libwrapper.so $I2P/lib/wrapper.jar
-# copied out of jbigi.jar by the router
-rm -f $I2P/libjbigi.so $I2P/libjcpuid.so
+# dpkg doesn't know about these files, they were copied out of jbigi.jar by the router
+LIB=/usr/lib/i2p
+rm -f $LIB/libjbigi.so $LIB/libjcpuid.so

 # the home directory for the i2p daemon
 SVCHOME=/var/lib/i2p
--- a/history.txt
+++ b/history.txt
@ -1,3 +1,14 @@
+* 2010-11-15  0.8.1 released
+
+2010-11-08 zzz
+    * I2CP: Fix NPE caused by null session options (seen in i2pbote)
+
+2010-11-06 HungryHobo
+    * New Ant target: debianrepo
+    * Rename debian target to debian-binary
+    * New debian target generates binary and source packages
+    * Debian tweaks
+
 2010-11-03 zzz
    * Merge and snark fixups

--- a/installer/install.xml
+++ b/installer/install.xml
@ -4,7 +4,7 @@

    <info>
        <appname>i2p</appname>
-        <appversion>0.8</appversion>
+        <appversion>0.8.1</appversion>
        <authors>
            <author name="I2P" email="http://forum.i2p2.de/"/>
        </authors>
--- a/installer/resources/eepsite.help/help/index_de.html
+++ b/installer/resources/eepsite.help/help/index_de.html
@ -2,14 +2,14 @@
 <html><head>

  
-    <title>Willkommen zu Ihrer Eepsite!</title>
+    <title>Willkommen auf Ihrer Eepseite!</title>
    <meta name="generator" content="muse.el">
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    <link rel="stylesheet" type="text/css" href="lib/eepsite.css">
  </head><body>
 <div class="fairylights">
 <div class="main">
-    <h1>Willkommen zu Ihrer Eepsite!</h1>
+    <h1>Willkommen auf Ihrer Eepseite!</h1>
 <div class="langbar">
 <!-- Most of these languages listed here are yet to be translated -->
 <a href="index.html"><img src="lib/us.png" title="English" alt="English"></a> 
@ -20,63 +20,62 @@
 <a href="index_ru.html"><img src="lib/ru.png" title="Русский" alt="Русский"></a> 
 <a href="index_sv.html"><img src="lib/se.png" title="Svenska" alt="Svenska"></a> 
 </div>
-<p>Diese ist Ihre <strong>Eepsite</strong>, Ihre Web-Präsens über I2P. Editieren Sie einfach die Dateien unter 
+<p>Dies ist Ihre <strong>Eepseite</strong>, Ihre Web-Präsens über I2P. Editieren Sie einfach die Dateien unter 
 <em>~/.i2p/eepsite/docroot/</em> (Linux) oder <em>%APPDATA%\I2P\eepsite\docroot\</em> (Windows)
 und nachdem Sie den Anweisungen weiter unten gefolgt sind, werden Sie –
-vertreten durch Ihre Eepsite – von anderen im I2P-Netz und, soweit
-verfügbar, über private „Out-Proxys“ weltweit erreichbar sein.</p>
+vertreten durch Ihre Eepseite – von anderen im I2P-Netz und, soweit
+verfügbar, über private „Out-Proxys“ weltweit auch im offenen Internet erreichbar sein.</p>

-<p>In I2P werden Eepsites unter Verwendung eines Schlüssels (key) adressiert, dieser wird durch eine sehr lange Base64-Zeichenkette<sup><a class="footref" name="fnr.1" href="#fn.1">1</a></sup> dargestellt.
-(Dieser Schlüssel ist analog zur Standard IP-Adresse zu verstehen; man kann ihn sich in der Konfiguration für Eepsites unter <a href="http://127.0.0.1:7657/i2ptunnel/index.jsp">I2PTunnel</a> anzeigen lassen.)</p>
+<p>In I2P werden Eepseiten unter Verwendung eines Schlüssels (key) adressiert. Dieser wird durch eine sehr lange Base64-Zeichenkette<sup><a class="footref" name="fnr.1" href="#fn.1">1</a></sup> dargestellt.
+(Dieser Schlüssel ist analog zur Standard IP-Adresse zu verstehen; man kann ihn sich in der Konfiguration der Eepseite unter <a href="http://127.0.0.1:7657/i2ptunnel/index.jsp">I2PTunnel</a> anzeigen lassen.)</p>

 <p>Folgende Anweisungen sollen zeigen, wie man einer Eepsite einen
-Namen wie beispielsweise „meineseite.i2p“ zuweist und an dem Schlüssel
+Namen wie beispielsweise „meineseite.i2p“ zuweist und an den Schlüssel
 bindet.
-Sie können Ihre Eepsite, nachdem sie gestartet wurde, lokal unter <a href="http://127.0.0.1:7658/">http://127.0.0.1:7658/</a> erreichen.</p>
+Sie können Ihre Eepseite, nachdem sie gestartet wurde, lokal unter <a href="http://127.0.0.1:7658/">http://127.0.0.1:7658/</a> erreichen.</p>

-<p>Es folgt eine schrittweise Anleitung für das Starten Ihrer neuen Eepsite und dessen Ankündigung in der I2P-Gemeinde.</p>
+<p>Es folgt eine schrittweise Anleitung für das Starten Ihrer neuen Eepseite und dessen Ankündigung in der I2P-Gemeinde.</p>

-<p>In der Grundeinstellung ist Ihre Eepsite nicht eingeschaltet.
-Auch nach dem sie gestartet wurde, ist es für andere Teilnehmer immer
-noch schwierig Ihre Seite zu finden, solange bis Sie Ihren
+<p>In der Grundeinstellung ist Ihre Eepseite nicht eingeschaltet.
+Auch nachdem sie gestartet wurde, ist es für andere Teilnehmer immer
+noch schwierig, Ihre Seite zu finden; solange bis Sie Ihren
 Base64-Schlüssel und den Namen Ihrer Eepsite veröffentlicht haben.
 Natürlich können Sie den Leuten diesen sehr langen Schlüssel auch so
 mitteilen, aber glücklicherweise bringt I2P bereits ein Adressbuch mit
-und hat verschiedene Wege um Ihre Eepsite bekannt zu machen.</p>
+und hat verschiedene Wege, Ihre Eepsite bekannt zu machen.</p>


-<h3>Eine detailierte Einführung</h3>
+<h3>Eine detaillierte Einführung</h3>

-<h4>Meine Eepsite</h4>
+<h4>Meine Eepseite</h4>

 <ol>
-<li>Wählen Sie einen eigenen Namen für Ihre Eepsite – nur in diesem
-Beispiel heißt sie „meineseite.i2p“ – benutzen Sie nur Kleinschrift.
-Sie können in Ihrem <a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=router">Adressbuch</a> überprüfen, ob der gewünschte Name bereits vergeben ist (Anmerkung: die Daten aus den Adressbuch werden im Klartext in der <em>i2p/hosts.txt</em> gespeichert).
+<li>Wählen Sie einen eigenen Namen für Ihre Eepseite – nur in diesem
+Beispiel heißt sie „meineseite.i2p“ – und benutzen Sie nur Kleinschrift.
+Sie können in Ihrem <a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=router">Adressbuch</a> überprüfen, ob der gewünschte Name bereits vergeben ist. (Anmerkung: die Daten aus den Adressbuch werden im Klartext in der Datei <em>i2p/hosts.txt</em> gespeichert).
 <br>
 <br></li>
-<li>Rufen Sie nun, möglichst in einem neuen Browser-Fenster, die Konfiguration für Eepsites <a href="http://127.0.0.1:7657/i2ptunnel/index.jsp">I2PTunnel</a> auf. Unter „Local Server Tunnels“ wählen Sie den Eintrag „<a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">eepsite</a>“.
-Sie befinden sich nun auf der Seite mit Überschrift „Edit server
-settings“. In das Feld für „Website name:“ überschreiben Sie die
+<li>Rufen Sie nun, möglichst in einem neuen Browser-Fenster, die Konfiguration der Eepseite unter <a href="http://127.0.0.1:7657/i2ptunnel/index.jsp">I2PTunnel</a> auf. Unter „Lokale Servertunnel“ wählen Sie dazu den Eintrag „<a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=3">Eepseite</a>“ aus.
+Sie befinden sich nun auf der Seite mit Überschrift „Servertunnel bearbeiten“. Im Feld für „Name der Webseite:“ überschreiben Sie die
 Vorgabe „mysite.i2p“ mit Ihrem Wunschnamen. Optional geben Sie im Feld
-„Description:“ eine Beschreibung an.
+„Beschreibung:“ eine Beschreibung an.
 <br>
 <br></li>
-<li>Wenn Sie möchten das Ihre Eepsite automatisch gestartet wird, kreuzen Sie das Feld „Auto Start:“ an.
+<li>Wenn Sie möchten, dass Ihre Eepsite automatisch gestartet wird, kreuzen Sie das Feld „Automatischer Start:“ an.
 <br>
 <br></li>
-<li>Durch drücken des Links „Add to local addressbook“ gleich rechts
-neben Ihrem Schlüssel (Feld „Local destination“) wird Ihr Schlüssel in
+<li>Durch Drücken des Links „zum lokalen Adressbuch hinzufügen“ gleich unterhalb
+Ihres Schlüssels (Feld „lokales Ziel“) wird dieser in
 Ihr <em>privates</em> Adressbuch geschrieben (<em>i2p/privatehosts.txt</em>).
 <br>
 <br></li>
-<li>Jetzt sichern Sie Ihre Einstellungen indem Sie auf „Save“ klicken.
+<li>Jetzt sichern Sie Ihre Einstellungen, indem Sie auf „Speichern“ klicken.
 <br>
 <br></li>
 <li>Wir gehen wieder zurück auf die Konfigurationsseite <a href="http://127.0.0.1:7657/i2ptunnel/index.jsp">I2PTunnel</a>
-und drücken den „Start“-Knopf für die „eepsite“. Nach dem erfolgreichen
-Start wird Ihre Eepsite auf der linken Seite in der I2P <a href="http://127.0.0.1:7657/index.jsp">Router Console</a> unter „Local
-Destinations“ angezeigt.</li>
+und drücken den „Start“-Knopf für die „Eepseite“. Nach dem erfolgreichen
+Start wird Ihre Eepseite links in der I2P-<a href="http://127.0.0.1:7657/index.jsp">Routerkonsole</a> unter „Lokale
+Ziele“ angezeigt.</li>
 </ol>


@ -85,50 +84,50 @@ Destinations“ angezeigt.</li>

 <ol>
 <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 ihn in die
-Zwischenablage. Stellen Sie sicher auch tatsächlich die gesamte, über
-500 Zeichen lange Zeichenkette die auf „AAAA“ endet, „erwischt“ zu
+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
 haben.
 <br>
 <br></li>
 <li>Öffnen Sie Ihr <a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=master">Master-Adressbuch</a>,
-tragen Ihren zuvor gewählten Wunschnamen ihrer Eepsite unter „Hostname“
-ein und kopieren den Schlüssel in das Feld „Destination“. Ein Klick auf
-„Add“ und diese „Destination“ ist in Ihrem Adressbuch.<sup><a class="footref" name="fnr.2" href="#fn.2">2</a></sup>
+tragen Ihren zuvor gewählten Wunschnamen ihrer Eepseite unter „Hostname“
+ein und kopieren den Schlüssel in das Feld „Ziel“. Ein Klick auf
+„Hinzufügen“ und dieses „Ziel“ ist in Ihrem Adressbuch.<sup><a class="footref" name="fnr.2" href="#fn.2">2</a></sup>
 <br>
 <br></li>
-<li>Ihre Eepsite sollte jetzt über den Browser erreichbar sein. Dazu
-tragen Sie, wie gewohnt, den Namen Ihrer Eepsite (hier im Beispiel
+<li>Ihre Eepseite sollte jetzt über den Browser erreichbar sein. Dazu
+tragen Sie, wie gewohnt, den Namen Ihrer Eepseite (hier im Beispiel
 „meineseite.i2p“) in die Adressleiste Ihres Browsers ein und rufen sie
 auf. Wenn alles gutgegangen ist, sind Sie nun wieder hier – nur die
 Adresse hat sich geändert.
 <br>
 <br></li>
-<li>Bevor Sie der Welt von Ihrer neuen Eepsite berichten sollte sie
+<li>Bevor Sie der Welt von Ihrer neuen Eepseite berichten, sollte sie
 auch über ein wenig Inhalt verfügen. Begeben Sie sich in das
 Verzeichnis <em>„~/.i2p/eepsite/docroot/“</em> (Linux) oder <em>„%APPDATA%\I2P\eepsite\docroot\“</em> (Windows)
-und benennen Sie dieses Dokument von <em>„index.html“</em> nach <em>„hilfe.html“</em> um, so können Sie später darauf zurück greifen. Erstellen Sie Ihre eigene <em>„index.html“</em> und füllen diese mit Inhalten, Bildern oder was auch immer Sie anderen hierüber mitteilen wollen.</li>
+und benennen Sie dieses Dokument von <em>„index.html“</em> in <em>„hilfe.html“</em> um, so können Sie später darauf zurückgreifen. Erstellen Sie Ihre eigene <em>„index.html“</em> und füllen diese mit Inhalten, Bildern oder was auch immer Sie anderen mitteilen wollen.</li>
 </ol>

-<h4><a name="AnkerDEOeA" id="AnkerDEOeA"></a>Die Eepsite öffentlich ankündigen</h4>
+<h4><a name="AnkerDEOeA" id="AnkerDEOeA"></a>Die Eepseite öffentlich ankündigen</h4>

 <ul>
 <li>Nun ist es an der Zeit, Ihre Eepsite in einem globalen I2P-Adressbuch, wie beispielsweise bei <a href="http://stats.i2p/i2p/addkey.html">stats.i2p</a>,
 einzutragen. Das heißt, Sie müssen Namen und Schlüssel Ihrer Eepsite
-und eine optionale Beschreibung in ein Formular auf einen 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">Eepsite</a>“
-im Feld „Local destination“ angegeben ist (... über 500 Zeichen, endet
+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“.
 Überprüfen Sie ob Ihr Schlüssel tatsächlich hinzugefügt wurde.
 <br>
 <br></li>
 <li>Da viele Router regelmäßig Adressbuchupdates von diesen Seiten
 erhalten, sollten andere innerhalb einiger Stunden in der Lage sein,
-Ihre Eesite durch
+Ihre Eeseite durch
 den Eintrag des Namens im Browser aufzurufen.
 <br>
 <br></li>
-<li>Weil wir gerade von Adressbuchupdates sprechen – es ist eine gute Zeit um weitere Adressbücher dem bestehenden <a href="http://127.0.0.1:7657/susidns/subscriptions.jsp">Abonnement</a>
+<li>Wo wir gerade von Adressbuchupdates sprechen – es ist ein guter Moment, weitere Adressbücher zum bestehenden <a href="http://127.0.0.1:7657/susidns/subscriptions.jsp">Abonnement</a>
 hinzuzufügen. Öffnen Sie Ihre Konfiguration und fügen Sie einige der
 folgenden Dienste Ihrem Abonnement hinzu (nur die jeweilige URL) und
 speichern Sie die Angaben.<sup><a class="footref" name="fnr.3" href="#fn.3">3</a></sup> Ab jetzt erhalten Sie ebenso alle Updates automatisch!
@ -140,40 +139,40 @@ speichern Sie die Angaben.<sup><a class="footref" name="fnr.3" href="#fn.3">3</a
 <br></p>
 </blockquote></li>
 <li>Haben Sie es eilig und können nicht 12 bis 24 Stunden warten, ist
-es möglich das andere für Ihre Eepseite den „jump“
-Adresshelfer-Umlenkungs-Dienst benutzen. Dieses funktioniert innerhalb
-einiger Minuten nach Eingabe des Schlüssels zu einem Adressbuch auf der
-gleichen Seite.<br><br>
-Zuerst testen Sie das mittels Aufruf folgender Dienste. Sobald das
-klappt, können anderen diese Möglichkeit nutzen. (Ersetzen Sie
-„meineseite.i2p“ durch Ihre Seite.)
+es möglich, dass andere für Ihre Eepseite den Adresshelfer-Umlenkungs-Dienst („jump service“) nutzen. Dieser funktioniert innerhalb
+einiger Minuten nach Eingabe des Schlüssels in ein Adressbuch auf der
+selben Seite.<br><br>
+Testen Sie Ihre Hinzufügung also zuerst mittels Aufruf folgender Dienste. Sobald das
+klappt, können anderen diese Möglichkeit auch nutzen. (Ersetzen Sie
+„meineseite.i2p“ durch Ihre Seite.):
 <ul>
 <li><a href="http://stats.i2p/cgi-bin/jump.cgi?a=meineseite.i2p">http://stats.i2p/cgi-bin/jump.cgi?a=meineseite.i2p</a> oder</li>
 <li><a href="http://i2host.i2p/cgi-bin/i2hostjump?meineseite.i2p">http://i2host.i2p/cgi-bin/i2hostjump?meineseite.i2p</a>
 <br>
 <br></li>
 </ul></li>
-<li>Manche Leute erkundigen sich auf Eepsites-Listen wie  <a href="http://inproxy.tino.i2p/status.php">inproxy.tino.i2p/status.php</a> über neue Eepsites, so könnten Sie an einige Besucher kommen. Aber es gibt weitere Wege sich anzukündigen:
+<li>Manche erkundigen sich auf Eepseitenlisten wie  <a href="http://inproxy.tino.i2p/status.php">inproxy.tino.i2p/status.php</a> über neue Eepseiten; so könnten Sie an einige Besucher kommen. Aber es gibt weitere Wege, sich anzukündigen:

 <ul>
-<li>Veröffentlichen Sie eine Nachricht im <a href="http://forum.i2p">I2P Forum</a> unter  <a href="http://forum.i2p/viewforum.php?f=16">Eepsite Announce</a></li>
-<li>Besuchen sie die IRC-Kanäle #i2p oder #i2p-chat (beide englischsprachig) und Werben Sie sanft für sich.</li>
+<li>Veröffentlichen Sie eine Nachricht im <a href="http://forum.i2p">I2P-Forum</a> unter <a href="http://forum.i2p/viewforum.php?f=16">Eepsite Announce</a></li>
+<li>Besuchen Sie die IRC-Kanäle #i2p oder #i2p-chat (beide englischsprachig) oder #i2p-de und werben Sie sanft für sich.</li>
 <li>Verbreiten Sie eine Nachricht über Syndie.</li>
 <li>Tragen Sie sich ein in Ughas <a href="http://ugha.i2p/EepsiteIndex">Eepsite Index</a> Wiki.
 <br>
 <br></li>
 </ul></li>
-<li>Bitte beachten Sie, einige Seiten empfehlen das Einfügen des langen
-„Destination“-Schlüssels; das können Sie wenn Sie möchten – aber wenn
+<li>Bitte beachten Sie: Einige Seiten empfehlen das Einfügen des langen
+„Ziel“- bzw. „Destination“-Schlüssels; das können Sie, wenn Sie möchten – aber wenn
 Sie Ihren Schlüssel erfolgreich beim „Schlüssel-Dienst“ eingetragen und
 ihn mittels „jump“-Dienst getestet haben, sollte nach 24 Stunden
 Wartezeit dieses Vorgehen nicht nötig sein.
 <br>
 <br></li>
-<li>Sollten Sie Fragen haben, benutzen Sie den IRC-Kanal #i2p oder die technische Abteilung im <a href="http://forum.i2p">I2P Forum</a></li>
+<li>Sollten Sie Fragen haben, benutzen Sie den IRC-Kanal #i2p oder die technische Abteilung im <a href="http://forum.i2p">I2P-Forum</a>!</li>
 </ul>


+<br>
 <hr><p class="footnote"><a class="footnum" name="fn.1" href="#fnr.1">1.</a> <strong>Base64</strong>
 beschreibt ein Verfahren zur Kodierung von 8-Bit-Binärdaten in eine
 Zeichenfolge, die nur aus wenigen, Codepage-unabhängigen ASCII-Zeichen
--- a/installer/resources/initialNews.xml
+++ b/installer/resources/initialNews.xml
@ -1,6 +1,6 @@
 <!--
-<i2p.news date="$Date: 2010-07-12 00:00:00 $">
-<i2p.release version="0.8" date="2010/07/12" minVersion="0.6"/>
+<i2p.news date="$Date: 2010-11-15 00:00:00 $">
+<i2p.release version="0.8.1" date="2010/11/15" minVersion="0.6"/>
 -->
 <div lang="en">
 <h4><ul><li>Congratulations on getting I2P installed!</li></ul></h4>
@ -24,24 +24,48 @@ Point your IRC client to <b>localhost:6668</b> and say hi to us on
 </div>

 <div lang="de">
-<h4><ul><li>Gratulation zur erfolgreichen Installation von I2P!</li></ul></h4>
+<h4><ul><li>Wir gratulieren zur erfolgreichen Installation von I2P!</li></ul></h4>
 <p>
-<b>Willkommen bei I2P!</b>
-Bitte noch <b>etwas Geduld</b> w&auml;hrend I2P startet und weitere I2P Router  findet.
+<b>Willkommen im I2P!</b>
+Hab noch <b>etwas Geduld</b>, w&auml;hrend I2P startet und weitere I2P-Router findet.
 </p>
 <p>
-Passe bitte In der Wartezeit <b>deine Einstellungen zur Bandbreite</b> auf der
-<a href="config.jsp">Einstellungsseite</a> an.
+Passe bitte in der Zwischenzeit <b>deine Einstellungen zur Bandbreite</b> auf der
+<a href="config.jsp">Einstellungsseite</a> an!
 </p>
 <p>
-Sobald auf der linken Seite eine "shared clients" Verbindung aufgelistet ist <b>besuche bitte</b> unsere <a href="http://www.i2p2.i2p/faq_de.html">FAQ</a>.
+Sobald auf der linken Seite eine Verbindung namens "versch. Klienten" aufgelistet ist, kannst Du unsere <a href="http://www.i2p2.i2p/faq_de.html">FAQ</a> besuchen.
 </p>
 <p>
-Verbinde deinen IRC Klienten mit dem Server auf <b>localhost:6668</b> und sage Hallo zu uns im Kanal 
-<a href="irc://127.0.0.1:6668/i2p-help">#i2p-help</a>, <a href="irc://127.0.0.1:6668/i2p-de">#i2p-de</a> oder <a href="irc://127.0.0.1:6668/i2p">#i2p</a>.
+Verbinde deinen IRC-Klienten mit dem Server auf <b>localhost:6668</b> und schau bei uns im Kanal 
+<a href="irc://127.0.0.1:6668/i2p-de">#i2p-de</a>, <a href="irc://127.0.0.1:6668/i2p-help">#i2p-help</a> oder <a href="irc://127.0.0.1:6668/i2p">#i2p</a> vorbei!
+</p>
+<p>
+Wir wünschen Dir viel Freude an unserem Netz und hoffen, Deine Erwartungen zu erfüllen.
 </p>
 </div>

+<div lang="es">
+<h4><ul><li>&iexcl;Felicidades!, has instalado el enrutador I2P con &eacute;xito.</li></ul></h4>
+<p>
+<b>&iexcl;Bienvenido a I2P!</b><br>
+&iexcl;Ten todav&iacute;a <b>paciencia</b> mientras I2P est&eacute; arrancando y encontrando otros enrutadores I2P!
+</p>
+<p>
+Este es el momento ideal para adaptar tu <b>configuraci&oacute;n de ancho de banda</b> en la 
+<a href="config.jsp">p&aacute;gina de configuraci&oacute;n</a>.
+</p>
+<p>
+En cuanto veas a la izquierda una conexi&oacute;n llamada "shared clients", puedes visitar nuestros <a href="http://www.i2p2.i2p/faq.html">FAQ</a>.
+</p>
+<p>
+&iexcl;Con&eacute;cta tu cliente IRC con el servidor <b>localhost:6668</b> y ven a saludarnos en los canales 
+<a href="irc://127.0.0.1:6668/i2p-es">#i2p-es</a>, <a href="irc://127.0.0.1:6668/i2p-help">#i2p-help</a> o <a href="irc://127.0.0.1:6668/i2p">#i2p</a>!
+</p>
+<p>
+Esperemos que tengas una buena experiencia con y en I2P.
+</p>
+</div>
 <div lang="nl">
 <h4><ul><li>Gefeliciteerd met de installatie van I2P!</li></ul></h4>
 <p>
--- a/installer/resources/man/eepget.1
+++ b/installer/resources/man/eepget.1
@ -0,0 +1,53 @@
+.\"Created with GNOME Manpages Editor Wizard
+.\"http://sourceforge.net/projects/gmanedit2
+.TH Eepget 1 "November 13, 2010" "" "Eepget - I2P Downloader"
+
+.SH NAME
+Eepget \- I2P downloader
+
+.SH SYNOPSIS
+.B eepget
+.RI [ options ] URL
+.br
+
+.SH DESCRIPTION
+\fBEepget\fP downloads a file via HTTP through the I2P network. It handles .i2p URLs as well as URLs on the regular web such as .com.
+
+.SH OPTIONS
+.B
+\fB\-p\fR proxy_host:port
+.TP
+Sets the I2P proxy server (eeproxy) to use. The default is 127.0.0.1:4444.
+.TP
+
+.B
+\fB\-n\fR retries
+.TP
+Sets the number of retries if the download fails. The default is 3.
+.TP
+
+.B
+\fB\-o\fR file
+.TP
+Sets the output file to write to. If this option is not given, the URL determines the output filename.
+.TP
+
+.B
+\fB\-m\fR markSize lineLen
+.TP
+Controls the progress display. \fB\ markSize \fP is the number of bytes one '#' character represents. \fB\ lineLen \fP is the length of one progress line in characters. The defaults are 1024 and 40.
+.TP
+
+.B
+\fB\-t\fR seconds
+.TP
+Sets the inactivity timeout. The default is 60 seconds.
+.TP
+
+.SH "EXIT STATUS"
+
+\fB Eepget\fP always exits with the status 0.
+
+.SH "SEE ALSO"
+
+wget(1)
--- a/installer/resources/man/i2prouter.1
+++ b/installer/resources/man/i2prouter.1
@ -0,0 +1,38 @@
+.\"Created with GNOME Manpages Editor Wizard
+.\"http://sourceforge.net/projects/gmanedit2
+.TH i2prouter 1 "November 13, 2010" "" "I2PRouter"
+
+.SH NAME
+i2prouter \- start and stop the I2P router
+
+.SH SYNOPSIS
+.B i2prouter
+.RI { console | start | stop | restart | status | dump }
+.br
+
+.SH DESCRIPTION
+\fBi2prouter\fP controls the I2P service. It takes options similar to init scripts.
+
+.B
+.IP console
+Runs I2P as a console application under the current user.
+
+.B
+.IP start
+Starts the I2P service.
+
+.B
+.IP stop
+Stops the I2P service.
+
+.B
+.IP restart
+Stops the I2P service and then starts it.
+
+.B
+.IP status
+Prints whether the I2P service is running.
+
+.B
+.IP dump
+Dumps the current threads into\fB wrapper.log\fP.
--- a/installer/resources/news.xml
+++ b/installer/resources/news.xml
@ -1,17 +1,20 @@
 <!--
-<i2p.news date="$Date: 2010-07-12 00:00:00 $">
-<i2p.release version="0.8" date="2010/07/12" minVersion="0.6" />
+<i2p.news date="$Date: 2010-11-15 00:00:00 $">
+<i2p.release version="0.8.1" date="2010/11/15" minVersion="0.6" />
 -->
 <div lang="en">
-<h4><ul><li>2010-07-12: <b>0.8 <a href="http://www.i2p2.i2p/release-0.8.html">Released</a></b></li></ul></h4>
+<h4><ul><li>2010-11-15: <b>0.8.1 <a href="http://www.i2p2.i2p/release-0.8.1.html">Released</a></b></li></ul></h4>
 <p>
-The 0.8 release contains the usual collection of bug fixes,
-as well as completion of the German translation by eche|on and a complete Dutch translation by monkeybrains and duck.
-This release is fully compatible with the 0.7.x releases.
+The 0.8.1 release contains the usual collection of bug fixes,
+and a newly colorful i2psnark theme by dr|zed.
+For increased security, files created by the router will now be readable only by the owner (mode 600).
 As usual, upgrading is recommended.
 </p><p>
+We have updated all our <a href="http://www.i2p2.i2p/how">technical specifications</a>
+and <a href="http://docs.i2p2.de/javadoc/">Javadocs</a>, check them out.
+
 Please help grow the network!
-Say hello to the volunteers on the new <a href="irc://127.0.0.1:6668/i2p-help">#i2p-help IRC channel</a>.
+Say hello to the volunteers on the <a href="irc://127.0.0.1:6668/i2p-help">#i2p-help IRC channel</a>.
 Give the
 developers feedback on <a href="irc://127.0.0.1:6668/i2p">IRC #i2p</a> or <a href="http://forum.i2p">forum.i2p</a>
 and <a href="http://www.i2p2.i2p/getinvolved.html">get involved</a>,
--- a/installer/resources/package-lists/java/package-list
+++ b/installer/resources/package-lists/java/package-list
@ -0,0 +1,203 @@
+java.applet
+java.awt
+java.awt.color
+java.awt.datatransfer
+java.awt.dnd
+java.awt.event
+java.awt.font
+java.awt.geom
+java.awt.im
+java.awt.im.spi
+java.awt.image
+java.awt.image.renderable
+java.awt.print
+java.beans
+java.beans.beancontext
+java.io
+java.lang
+java.lang.annotation
+java.lang.instrument
+java.lang.management
+java.lang.ref
+java.lang.reflect
+java.math
+java.net
+java.nio
+java.nio.channels
+java.nio.channels.spi
+java.nio.charset
+java.nio.charset.spi
+java.rmi
+java.rmi.activation
+java.rmi.dgc
+java.rmi.registry
+java.rmi.server
+java.security
+java.security.acl
+java.security.cert
+java.security.interfaces
+java.security.spec
+java.sql
+java.text
+java.text.spi
+java.util
+java.util.concurrent
+java.util.concurrent.atomic
+java.util.concurrent.locks
+java.util.jar
+java.util.logging
+java.util.prefs
+java.util.regex
+java.util.spi
+java.util.zip
+javax.accessibility
+javax.activation
+javax.activity
+javax.annotation
+javax.annotation.processing
+javax.crypto
+javax.crypto.interfaces
+javax.crypto.spec
+javax.imageio
+javax.imageio.event
+javax.imageio.metadata
+javax.imageio.plugins.bmp
+javax.imageio.plugins.jpeg
+javax.imageio.spi
+javax.imageio.stream
+javax.jws
+javax.jws.soap
+javax.lang.model
+javax.lang.model.element
+javax.lang.model.type
+javax.lang.model.util
+javax.management
+javax.management.loading
+javax.management.modelmbean
+javax.management.monitor
+javax.management.openmbean
+javax.management.relation
+javax.management.remote
+javax.management.remote.rmi
+javax.management.timer
+javax.naming
+javax.naming.directory
+javax.naming.event
+javax.naming.ldap
+javax.naming.spi
+javax.net
+javax.net.ssl
+javax.print
+javax.print.attribute
+javax.print.attribute.standard
+javax.print.event
+javax.rmi
+javax.rmi.CORBA
+javax.rmi.ssl
+javax.script
+javax.security.auth
+javax.security.auth.callback
+javax.security.auth.kerberos
+javax.security.auth.login
+javax.security.auth.spi
+javax.security.auth.x500
+javax.security.cert
+javax.security.sasl
+javax.sound.midi
+javax.sound.midi.spi
+javax.sound.sampled
+javax.sound.sampled.spi
+javax.sql
+javax.sql.rowset
+javax.sql.rowset.serial
+javax.sql.rowset.spi
+javax.swing
+javax.swing.border
+javax.swing.colorchooser
+javax.swing.event
+javax.swing.filechooser
+javax.swing.plaf
+javax.swing.plaf.basic
+javax.swing.plaf.metal
+javax.swing.plaf.multi
+javax.swing.plaf.synth
+javax.swing.table
+javax.swing.text
+javax.swing.text.html
+javax.swing.text.html.parser
+javax.swing.text.rtf
+javax.swing.tree
+javax.swing.undo
+javax.tools
+javax.transaction
+javax.transaction.xa
+javax.xml
+javax.xml.bind
+javax.xml.bind.annotation
+javax.xml.bind.annotation.adapters
+javax.xml.bind.attachment
+javax.xml.bind.helpers
+javax.xml.bind.util
+javax.xml.crypto
+javax.xml.crypto.dom
+javax.xml.crypto.dsig
+javax.xml.crypto.dsig.dom
+javax.xml.crypto.dsig.keyinfo
+javax.xml.crypto.dsig.spec
+javax.xml.datatype
+javax.xml.namespace
+javax.xml.parsers
+javax.xml.soap
+javax.xml.stream
+javax.xml.stream.events
+javax.xml.stream.util
+javax.xml.transform
+javax.xml.transform.dom
+javax.xml.transform.sax
+javax.xml.transform.stax
+javax.xml.transform.stream
+javax.xml.validation
+javax.xml.ws
+javax.xml.ws.handler
+javax.xml.ws.handler.soap
+javax.xml.ws.http
+javax.xml.ws.soap
+javax.xml.ws.spi
+javax.xml.ws.wsaddressing
+javax.xml.xpath
+org.ietf.jgss
+org.omg.CORBA
+org.omg.CORBA.DynAnyPackage
+org.omg.CORBA.ORBPackage
+org.omg.CORBA.TypeCodePackage
+org.omg.CORBA.portable
+org.omg.CORBA_2_3
+org.omg.CORBA_2_3.portable
+org.omg.CosNaming
+org.omg.CosNaming.NamingContextExtPackage
+org.omg.CosNaming.NamingContextPackage
+org.omg.Dynamic
+org.omg.DynamicAny
+org.omg.DynamicAny.DynAnyFactoryPackage
+org.omg.DynamicAny.DynAnyPackage
+org.omg.IOP
+org.omg.IOP.CodecFactoryPackage
+org.omg.IOP.CodecPackage
+org.omg.Messaging
+org.omg.PortableInterceptor
+org.omg.PortableInterceptor.ORBInitInfoPackage
+org.omg.PortableServer
+org.omg.PortableServer.CurrentPackage
+org.omg.PortableServer.POAManagerPackage
+org.omg.PortableServer.POAPackage
+org.omg.PortableServer.ServantLocatorPackage
+org.omg.PortableServer.portable
+org.omg.SendingContext
+org.omg.stub.java.rmi
+org.w3c.dom
+org.w3c.dom.bootstrap
+org.w3c.dom.events
+org.w3c.dom.ls
+org.xml.sax
+org.xml.sax.ext
+org.xml.sax.helpers
--- a/installer/resources/package-lists/jetty/package-list
+++ b/installer/resources/package-lists/jetty/package-list
@ -0,0 +1,37 @@
+javax.servlet
+javax.servlet.http
+javax.servlet.jsp
+javax.servlet.jsp.el
+javax.servlet.jsp.tagext
+org.mortbay.ftp
+org.mortbay.html
+org.mortbay.http
+org.mortbay.http.ajp
+org.mortbay.http.ajp.jmx
+org.mortbay.http.handler
+org.mortbay.http.handler.jmx
+org.mortbay.http.ibmjsse
+org.mortbay.http.jmx
+org.mortbay.http.nio
+org.mortbay.jaas
+org.mortbay.jaas.callback
+org.mortbay.jaas.spi
+org.mortbay.jetty
+org.mortbay.jetty.jmx
+org.mortbay.jetty.plus
+org.mortbay.jetty.plus.jmx
+org.mortbay.jetty.servlet
+org.mortbay.jetty.servlet.jmx
+org.mortbay.jetty.win32
+org.mortbay.jndi
+org.mortbay.jndi.java
+org.mortbay.jndi.local
+org.mortbay.loadbalancer
+org.mortbay.log
+org.mortbay.log4j
+org.mortbay.servlet
+org.mortbay.start
+org.mortbay.stop
+org.mortbay.util
+org.mortbay.util.jmx
+org.mortbay.xml
--- a/installer/resources/package-lists/jrobin/package-list
+++ b/installer/resources/package-lists/jrobin/package-list
@ -0,0 +1,2 @@
+org.jrobin.core
+org.jrobin.graph
--- a/installer/resources/proxy/ahelper-conflict-header_de.ht
+++ b/installer/resources/proxy/ahelper-conflict-header_de.ht
@ -0,0 +1,27 @@
+HTTP/1.1 409 Conflict
+Content-Type: text/html; charset=UTF-8
+Cache-control: no-cache
+Connection: close
+Proxy-Connection: close
+
+<html><head>
+<title>I2P-Warnung: kollidierende Ziele</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/index.jsp" 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">Configuratie</a> <a href="http://127.0.0.1:7657/help.jsp">Help</a> <a href="http://127.0.0.1:7657/susidns/">Adresboek</a>
+</div>
+<div class=warning id=warning>
+<h3>Warnung: Zielkonflikt</h3>
+Dier Adresshelperverweis, dem Sie folgen wollen, verwendet für diesen Hostnamen ein anderes kryptographisches Ziel
+als im zugehörigen Eintrag in Ihrem Routeradressbuch angegeben.
+Jemand könnte versuchen, fälschlicherweise eine andere Eepseite als die gesuchte auszugeben.
+Möglicherweise haben aber die betreiber beider Eepseiten auch nur zufällig denselben Namen ausgewählt.
+<p>
+Diesen Konflikt können sie lösen, indem Sie entscheiden, welchem Ziel Sie trauen, das gesuchte zu sein,
+und dann entweder den Verweis des Adresshelfers verwerfen, den Eintrag in Ihrem Routeradressbuch löschen, 
+oder beiden Zielen unterschiedliche Namen zuweisen.
+<p>
--- a/installer/resources/proxy/denied-header_de.ht
+++ b/installer/resources/proxy/denied-header_de.ht
@ -0,0 +1,20 @@
+HTTP/1.1 403 Request Denied
+Content-Type: text/html; charset=UTF-8
+Cache-control: no-cache
+Connection: close
+Proxy-Connection: close
+
+<html><head>
+<title>I2P-Warnung: Anfrage verweigert</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/index.jsp" title="Routerkonsole"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="I2P-Routerkonsole" border="0"></a><hr>
+ <a href="http://127.0.0.1:7657/config.jsp">Einstellungen</a> <a href="http://127.0.0.1:7657/help.jsp">Hilfe</a> <a href="http://127.0.0.1:7657/susidns/">Adressbuch</a>
+</div>
+<div class=warning id=warning>
+<h3>Warnung: Anfrage verweigert</h3>
+Sie haben versucht, sich mit einer Webseite oder einem anderen Ziel außerhalb von I2P zu verbinden.
+</div>
--- a/installer/resources/proxy/dnf-header_de.ht
+++ b/installer/resources/proxy/dnf-header_de.ht
@ -0,0 +1,23 @@
+HTTP/1.1 504 Gateway Timeout
+Content-Type: text/html; charset=UTF-8
+Cache-control: no-cache
+Connection: close
+Proxy-Connection: close
+
+<html><head>
+<title>I2P-Warnung: Eepseite nicht erreichbar</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/index.jsp" title="Routerkonsole"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="I2P-Routerkonsole" border="0"></a><hr>
+ <a href="http://127.0.0.1:7657/config.jsp">Einstellungen</a> <a href="http://127.0.0.1:7657/help.jsp">Hilfe</a> <a href="http://127.0.0.1:7657/susidns/index.jsp">Adressbuch</a>
+</div>
+<div class=warning id=warning>
+<h3>Warnung: Eepseite unerreichbar</h3>
+Die Eepseite war nicht erreichbar.
+Die Eepseite ist offline, es gibt eine Überlast oder Verstopfung im Netz,
+or Ihr Router ist noch nicht gut ins Netzwerk integriert.
+Versuchen Sie einr <a href="javascript: window.location.reload()">Neuladen</a>. 
+<hr><b>Konnte das folgende Ziel nicht finden:</b><BR><BR>
--- a/installer/resources/proxy/dnfb-header_de.ht
+++ b/installer/resources/proxy/dnfb-header_de.ht
@ -0,0 +1,23 @@
+HTTP/1.1 400 Destination Not Found
+Content-Type: text/html; charset=UTF-8
+Cache-control: no-cache
+Connection: close
+Proxy-Connection: close
+
+<html><head>
+<title>I2P-Warnung: ungültiges Eepseiten-Ziel</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/index.jsp" title="Routerkonsole"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="I2P-Routerkonsole" border="0"></a><hr>
+ <a href="http://127.0.0.1:7657/config.jsp">Einstellungen</a> <a href="http://127.0.0.1:7657/help.jsp">Help</a> <a href="http://127.0.0.1:7657/susidns/">Adressbuch</a>
+</div>
+<div class=warning id=warning>
+<h3>Warnung: ungültiges Eepseiten-Ziel</h3>
+Das angegebene Eepseiten-Ziel ist nicht gültig,
+oder andernarts nicht erreichbar. Vielleicht habe Sie eine falsche BASIS64-Zeichenkette kopiert
+oder Sie folgten einem ungültigen Verweis. Möglicherweise ist auch der I2P-Host offline. 
+Versuchen Sie ein <a href="javascript: window.location.reload()">Neuladen</a>.
+<hr><b>Konnte das folgende Ziel nicht finden:</b><BR><BR>
--- a/installer/resources/proxy/dnfh-header_de.ht
+++ b/installer/resources/proxy/dnfh-header_de.ht
@ -0,0 +1,27 @@
+HTTP/1.1 404 Domain Not Found
+Content-Type: text/html; charset=UTF-8
+Cache-control: no-cache
+Connection: close
+Proxy-Connection: close
+
+<html><head>
+<title>I2P-Warnung: Eepsite unbekannt</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/index.jsp" title="Routerkonsole"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="I2P-Routerkonsole" border="0"></a><hr>
+ <a href="http://127.0.0.1:7657/config.jsp">Configuratie</a> <a href="http://127.0.0.1:7657/help.jsp">Hilfe</a> <a href="http://127.0.0.1:7657/susidns/index.jsp">Adressbuch</a>
+</div>
+<div class=warning id=warning>
+<h3>Warnung: Eepseite nicht im Adressbuch gefunden</h3>
+Die Eepseite konnte in nicht im Adressbuch des Routers gefunden werden.
+Überprüfen Sie den Link oder finden Sie eine BASIS64-Adresse.
+Wenn Sie eine BASIS64-Adresse haben, fügen Sie diese unter folgendem Link Ihrer userhosts.txt zu:
+<a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=master">SusiDNS</a>,
+benutzen Sie einen BASIS64-Adresshelfer, oder einen der folgenden Sprungdienste:<br><br>
+Sehen Sie diese Seite öfters? Dann lesen Sie die <a href="http://www.i2p2.i2p/faq.html#subscriptions">FAQ</a>
+für Hilfe beim <a href="http://127.0.0.1:7657/susidns/config.jsp">Hinzufügen von Abonnements</a>
+zu Ihrem Adressbuch.<hr>
+<b>Konnte das folgende Ziel nicht finden:</b><BR><BR>
--- a/installer/resources/proxy/dnfp-header_de.ht
+++ b/installer/resources/proxy/dnfp-header_de.ht
@ -0,0 +1,27 @@
+HTTP/1.1 504 Gateway Timeout
+Content-Type: text/html; charset=UTF-8
+Cache-control: no-cache
+Connection: close
+Proxy-Connection: close
+
+<html><head>
+<title>I2P-Warnung: Outproxy nicht gefunden</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/index.jsp" title="Routerkonsole"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="I2P-Routerkonsole" border="0"></a><hr>
+ <a href="http://127.0.0.1:7657/config.jsp">Einstellungen</a> <a href="http://127.0.0.1:7657/help.jsp">Hilfe</a> <a href="http://127.0.0.1:7657/susidns/">Adressbuch</a>
+</div>
+<div class=warning id=warning>
+<h3>Warnung: I2P-Proxy nicht gefunden</h3>
+Der WWW-Outproxy wurde nicht gefunden.
+Er ist offline, das Netz ist überlastet oder verstopft,
+oder Ihr Router ist noch nicht gut ins Netzwerk integriert.
+Versuchen Sie ein <a href="javascript: parent.window.location.reload()">Neuladen</a> 
+da dies eine erneute zufällige Auswahl des Outproxys aus der von Ihnen <a href="http://127.0.0.1:7657/i2ptunnel/index.jsp">hier</a> vorgegebenen Liste trifft 
+(falls mehr als einer angegeben ist).
+Wenn das Problem weiterhin bestehen sollte, passen Sie die Liste Ihrer Outproxys 
+<a href="http://127.0.0.1:7657/i2ptunnel/edit.jsp?tunnel=0">hier</a> an!
+<hr><b>Konnte das folgende Ziel nicht finden:</b><BR><BR>
--- a/installer/resources/proxy/localhost-header_de.ht
+++ b/installer/resources/proxy/localhost-header_de.ht
@ -0,0 +1,23 @@
+HTTP/1.1 403 Access Denied
+Content-Type: text/html; charset=UTF-8
+Cache-control: no-cache
+Connection: close
+Proxy-Connection: close
+
+<html><head>
+<title>I2P-Fehler: Anfrage verweigert</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>
+<!-----------------------------
+  Let's not infinite loop here....
+<div class=logo>
+ <a href="http://127.0.0.1:7657/index.jsp" title="Routerkonsole"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="I2P-Routerkonsole" border="0"></a><hr>
+ <a href="http://127.0.0.1:7657/config.jsp">Einstellungen</a> <a href="http://127.0.0.1:7657/help.jsp">Hilfe</a> <a href="http://127.0.0.1:7657/susidns/">Adressbuch</a>
+</div>
+------------------------------>
+<div class=warning id=warning>
+<h3>Fehler: Lokaler Zugriff</h3>
+Ihr Browser ist fehlkonfiguriert. Benutzen Sie diesen Proxy nicht, um auf lokale Ziele wie die I2P-Routerkonsole, localhost oder LAN-Ziele zuzugreifen!
+</div>
--- a/installer/resources/proxy/noproxy-header_de.ht
+++ b/installer/resources/proxy/noproxy-header_de.ht
@ -0,0 +1,20 @@
+HTTP/1.1 503 Service Unavailable
+Content-Type: text/html; charset=UTF-8
+Cache-control: no-cache
+Connection: close
+Proxy-Connection: close
+
+<html><head>
+<title>I2P-Warnung: Kein Outproxy eingerichtet</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/index.jsp" title="Routerkonsole"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="I2P-Routerkonsole" border="0"></a><hr>
+ <a href="http://127.0.0.1:7657/config.jsp">Einstellungen</a> <a href="http://127.0.0.1:7657/help.jsp">Hilfe</a> <a href="http://127.0.0.1:7657/susidns/">Adressbuch</a>
+</div>
+<div class=warning id=warning>
+<h3>Warnung: Kein Outproxy eingerichtet</h3>
+Sie haben eine Seite außerhalb des I2P-Netzes angefordert, jedoch ist kein HTTP-Outproxy eingerichtet. Bitte richten sie einen Outproxy in I2PTunnel ein!
+</div>
--- a/installer/resources/proxy/protocol-header_de.ht
+++ b/installer/resources/proxy/protocol-header_de.ht
@ -0,0 +1,21 @@
+HTTP/1.1 403 Bad Protocol
+Content-Type: text/html; charset=UTF-8
+Cache-control: no-cache
+Connection: close
+Proxy-Connection: close
+
+<html><head>
+<title>I2P-Warnung: nicht HTTP-Protokoll</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/index.jsp" title="Routerkonsole"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="I2P-Routerkonsole" border="0"></a><hr>
+ <a href="http://127.0.0.1:7657/config.jsp">Einstellungen</a> <a href="http://127.0.0.1:7657/help.jsp">Hilfe</a> <a href="http://127.0.0.1:7657/susidns/">Adressbuch</a>
+</div>
+<div class=warning id=warning>
+<h3>Warnung: nicht HTTP-Protokoll</h3>
+Die Anfrage verwendet ein falsches Protokoll.
+I2Ps HTTP-Proxy unterstützt AUSSCHLIEßLICH Anfragen des HTTP-Protokolls ( http:// ). Andere Protokolle wie https:// und ftp:// sind nicht erlaubt.
+</div>
--- a/installer/resources/readme/readme.html
+++ b/installer/resources/readme/readme.html
@ -1,8 +1,9 @@
 <div align="right"> 
  <div class="langbox" align="right"><a href="/index.jsp?lang=en"><img src="/flags.jsp?c=us" title="English" alt="English"></a> 
-    <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="Chinese" alt="Chinese"></a> 
+    <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="中文" alt="中文"></a> 
    <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> 
    <a href="/index.jsp?lang=fr"><img src="/flags.jsp?c=fr" title="Fran&ccedil;ais" alt="Fran&ccedil;ais"></a> 
+    <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Espa&ntilde;ol" alt="Espa&ntilde;ol"></a> 
    <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> 
    <a href="/index.jsp?lang=ru"><img src="/flags.jsp?c=ru" title="Русский" alt="Русский"></a> 
    <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
@ -29,7 +30,7 @@ up, you can:</p>
      <li><a href="http://fproxy.tino.i2p">fproxy.tino.i2p</a>: 
        Freenet proxy</li>
      <li><a href="http://echelon.i2p">echelon.i2p</a>: software 
-        archive and information for I2P</li>
+        archive (I2PFox, iMule, I2P-Messenger, ... ) and information for I2P</li>
      <li><a href="http://paste.i2p2.i2p">paste.i2p2.i2p</a>: secure and 
        anonymous paste service.</li>
    </ul><br>
@ -49,7 +50,10 @@ up, you can:</p>
        email within I2P as well as mail from and to the normal internet! get 
        your account at <a href="http://hq.postman.i2p/">hq.postman.i2p</a>. We 
        bundle <a href="/susimail/susimail">susimail</a>, a web based anonymity-oriented 
-        pop3/smtp client configured to access postman's mail services.</li>
+        pop3/smtp client configured to access postman's mail services. 
+	<br>Alternatively, you can try out our new serverless, end-to-end encrypted e-mail system 
+	<a href="http://tjgidoycrw6s3guetge3kvrvynppqjmvqsosmtbmgqasa6vmsf6a.b32.i2p/">I2P-Bote</a> 
+	(with webinterface), installable as a plugin.<br></li>
      <li class="tidylist"><b>chat anonymously</b> - fire up your own IRC client 
        and connect to the server at <b>127.0.0.1 port 6668</b>. This points at 
        one of two anonymously hosted IRC servers, but neither you nor they know 
--- a/installer/resources/readme/readme_de.html
+++ b/installer/resources/readme/readme_de.html
@ -1,78 +1,82 @@
 <div lang="de">
 <div align="right">
-<div class="langbox" align="right"><a href="/index.jsp?lang=en"><img src="/flags.jsp?c=us" title="English" alt="English"></a> <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="Chinese" alt="Chinese"></a> <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> <a href="/index.jsp?lang=fr"><img src="/flags.jsp?c=fr" title="Fran&ccedil;ais" alt="Fran&ccedil;ais"></a> <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> <a href="/index.jsp?lang=ru"><img src="/flags.jsp?c=ru" title="Русский" alt="Русский"></a> <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
+<div class="langbox" align="right"><a href="/index.jsp?lang=en"><img src="/flags.jsp?c=us" title="English" alt="English"></a> <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="中文" alt="中文"></a> <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> <a href="/index.jsp?lang=fr"><img src="/flags.jsp?c=fr" title="Fran&ccedil;ais" alt="Fran&ccedil;ais"></a> <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Espa&ntilde;ol" alt="Espa&ntilde;ol"></a> <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> <a href="/index.jsp?lang=ru"><img src="/flags.jsp?c=ru" title="Русский" alt="Русский"></a> <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
 </div>
-<div class="welcome"><h2>Willkommen zu I2P!</h2></div>
-<p>Wenn Du gerade I2P gestartet hast, sollten die "Active:" Zahlen links in den n&auml;chsten paar Minuten anwachsen und Du siehst dann dort ein "shared clients" lokales Ziel gelistet (falls nicht, <a href="#trouble">siehe Unten</a>). Sobald das erscheint, kannst Du:</p>
+<div class="welcome"><h2>Willkommen im I2P!</h2></div>
+<p>Wenn Du I2P gerade gestartet hast, sollten die "Aktiv:"-Zahlen links in den n&auml;chsten paar Minuten anwachsen, und Du siehst dann dort ein als "versch. Klienten" bezeichnetes lokales Ziel gelistet (falls nicht, <a href="#trouble">siehe unten</a>). Sobald das erscheint, kannst Du:</p>
 <ul>
- <li><b>"Eepsites" besuchen</b> - In I2P sind anonym gehostete Websites - 
-     Stelle Deinen Browser so ein, &uuml;ber den <b>HTTP proxy: 127.0.0.1 port 4444</b> zu surfen, dann besuche eine Eepsite:<br>
+ <li><b>"Eepseiten" besuchen</b> - In I2P gibt es anonym gehostete Websites: 
+     Konfiguriere Deinen Browser, &uuml;ber den <b>HTTP-Proxy: 127.0.0.1 Port 4444</b> zu surfen, dann besuche eine Eepseite:<br>
     <ul class="links">
         <li><a href="http://forum.i2p/">forum.i2p</a>: Eine sichere und anonyme Verbindung zu <a href="http://forum.i2p2.de/">forum.i2p2.de</a></li>
         <li><a href="http://www.i2p2.i2p/index_de.html">www.i2p2.i2p</a> und der Spiegel <a href="http://i2p-projekt.i2p/index_de.html">i2p-projekt.i2p</a>:
-              Sichere und anonyme Verbindung zu <a href="http://www.i2p2.de/index_de.html">www.i2p2.de</a></li>
-         <li><a href="http://eepsites.i2p/">eepsites.i2p</a>: Eine anonym gehostete Suchseite f&uuml;r Eepsites</li>
-         <li><a href="http://ugha.i2p/">ugha.i2p</a>: Ugha's Eepsite, ein &ouml;ffentliches Wiki mit vielen Links</li>
-         <li><a href="http://fproxy.tino.i2p">fproxy.tino.i2p</a>: Freenet proxy</li>
-	 <li><a href="http://echelon.i2p">echelon.i2p</a>: Software Archive und Informationen zu I2P</li>
+              Sichere und anonyme Verbindungen zu <a href="http://www.i2p2.de/index_de.html">www.i2p2.de</a></li>
+         <li><a href="http://eepsites.i2p/">eepsites.i2p</a>: Eine anonym gehostete Suchseite f&uuml;r Eepseiten</li>
+         <li><a href="http://ugha.i2p/">ugha.i2p</a>: Ugha's Eepseite, ein &ouml;ffentliches Wiki mit vielen Links</li>
+         <li><a href="http://fproxy.tino.i2p">fproxy.tino.i2p</a>: ein Freenet-Proxy</li>
+	 <li><a href="http://echelon.i2p">echelon.i2p</a>: Softwarearchiv und Informationen zu I2P (mit BitTorrent-Klienten, iMule, I2PFox, I2P-Messenger, ...)</li>
         <li><a href="http://paste.i2p2.i2p">paste.i2p2.i2p</a>: Anonymer Pastebin</li>
 	</ul><br />
-     Es gibt viel mehr Eepsites - folge einfach den Links die du findest,
-     bookmarke Deine Favoriten und besuche sie oft!</li><br />
- <li class="tidylist"><b>Im Internet surfen</b> - Es gibt einen HTTP "outproxy" in I2P in Deinem
-     HTTP proxy auf Port 4444 - Konfiguriere Deine Browser's Proxy Einstellung 
-     darauf (siehe Oben) und besuche jede normale URL - Deine Anfrage wird 
+     Es gibt viele andere Eepseiten - folge einfach den Links, die du findest,
+     setze Lesezeichen f&uuml;r Deine Favoriten, und besuche sie oft!</li><br />
+ <li class="tidylist"><b>Im Internet surfen</b> - Es gibt in I2P einen HTTP-"Outproxy". Um ihn zu nutzen, kannst du ebenfalls den
+     HTTP-Proxy auf Port 4444 verwenden - Konfiguriere Deines Browsers Proxy-Einstellungen 
+     darauf (siehe oben) und besuche jede normale URL - Deine Anfrage wird dann anonym 
     durch das I2P Netzwerk geroutet.</li>
 <li class="tidylist"><b>Daten austauschen</b> - Es gibt eine <a href="i2psnark/">Portierung</a> des
-     <a href="http://www.klomp.org/snark/">Snark</a> <a href="http://www.bittorrent.com/">BitTorrent</a>
-     Clients.</li>
- <li class="tidylist"><b>Anonyme Email</b> - Postman hat ein Email System aufgebaut, das 
-     kompatibel mit normalen  Email-Clients (POP3 / SMTP) ist, welches erlaubt, 
-     Email innerhalb von I2P sowie Email von und zum normalen Internet zu 
-     schicken!  Hole Dir Dein Emailkonto auf <a href="http://hq.postman.i2p/">hq.postman.i2p</a>.
-     Im Verbund dazu haben wir <a href="/susimail/susimail">susimail</a>, ein 
-     Internet-Browser basierter, anonymer pop3/smtp Client, fertig eingerichtet 
-     f&uuml;r Postman's Email Service.</li>
- <li class="tidylist"><b>Anonymer Chat</b> - Starte Deinen Lieblings IRC Client und verbinde ihn 
-     mit dem Server <b>127.0.0.1 Port 6668</b>.  Das richtet Dich auf auf einen 
-     von zwei anonym gehosteten IRC Servern, aber weder Du noch die wissen wer 
-     der Andere ist.</li>
- <li class="tidylist"><b>Anonymer Blog</b> - Probiere <a href="http://syndie.i2p2.de/">Syndie</a> aus</li>
- <li class="tidylist">und Vieles mehr</li>
+     <a href="http://www.klomp.org/snark/">Snark</a> <a href="http://www.bittorrent.com/">BitTorrent</a>-Klienten.</li>
+ <li class="tidylist"><b>Anonyme Email</b> - Postman hat ein Email-System aufgebaut, das 
+     kompatibel zu normalen  Email-Klienten (POP3/SMTP) ist, und welches es erlaubt, 
+     Emails innerhalb von I2P sowie Emails von und ins normale Internet zu 
+     schicken.  Hole Dir Dein Emailkonto auf <a href="http://hq.postman.i2p/">hq.postman.i2p</a>.
+     Im Verbund damit gibt es <a href="/susimail/susimail">susimail</a>, einen 
+     browserbasierten anonymen POP3/SMTP-Klienten, fertig eingerichtet 
+     f&uuml;r Postmans Email-Service. 
+     <br>Oder probier unser neues serverloses und Ende-zu-Ende-verschl&uuml;sseltes Emailsystem <a href="http://tjgidoycrw6s3guetge3kvrvynppqjmvqsosmtbmgqasa6vmsf6a.b32.i2p/">I2P-Bote</a> (mit Webinterface) aus, welches als Plugin erh&auml;ltlich ist!</li>
+ <li class="tidylist"><b>Anonymer Chat</b> - Starte Deinen Lieblings-IRC-Klienten und verbinde ihn 
+     mit dem Server unter <b>127.0.0.1 auf Port 6668</b>.  Das bringt Dich auf auf einen 
+     von zwei anonym gehosteten IRC-Servern - und weder Du noch die anderen Benutzer wissen, wer 
+     der jeweils andere ist, nicht einmal der Server-Administrator.</li>
+ <li class="tidylist"><b>Anonymer Blog</b> - Probiere <a href="http://syndie.i2p2.de/">Syndie</a> aus!</li>
+ <li class="tidylist">und vieles mehr</li>
 </ul>

-<h2>Willst Du Deine eigene Eepsite?</h2>
+<h2>Willst Du Deine eigene Eepseite?</h2>

-<p>Wir bringen Software mit, damit Du Deine eigene Eepsite laufen lassen kannst 
-   - Eine 
-<a href="http://jetty.mortbay.org/">Jetty</a> Instanz horcht auf 
+<p>Das I2P-Paket beinhaltet Software, die es Dir  erm&ouml;glicht, Deine eigene Eepseite zu betreiben 
+   : Eine 
+<a href="http://jetty.mortbay.org/">Jetty</a>-Instanz horcht auf 
 <a href="http://127.0.0.1:7658/">http://127.0.0.1:7658/</a>. Platziere einfach 
-   Deine Dateien in das <code>eepsite/docroot/</code> Verzeichnis (oder jedes 
+   Deine Dateien im Verzeichnis <code>eepsite/docroot/</code> (oder jedes 
   Standard-JSP/Servlet <code>.war</code> unter <code>eepsite/webapps</code>, 
-   oder CGI Scripte unter <code>eepsite/cgi-bin</code>) und schon sind sie 
-   verf&uuml;gbar.  Nach dem Start des <a href="/i2ptunnel/">Eepsite tunnels</a>
-   der darauf zeigt ist Deine Eepsite f&uuml;r Andere verf&uuml;gbar. 
-   Detailierte Instruktionen zum Start Deiner eigenen Eepsite sind auf
-   <a href="http://127.0.0.1:7658/">Deine tempor&auml;re Eepsite</a>.
+   CGI Scripte unter <code>eepsite/cgi-bin</code>) und schon sind sie 
+   verf&uuml;gbar.  Nach dem Starten des <a href="/i2ptunnel/">Eepseiten-Tunnels</a>,
+   der darauf zeigt, ist Deine Eepseite f&uuml;r andere verf&uuml;gbar. 
+   Detailierte Instruktionen zum Start Deiner eigenen Eepseite findest Du auf
+   <a href="http://127.0.0.1:7658/">Deiner tempor&auml;ren Eepseite</a>.
 </p>

-<h2><a name="trouble">Troubleshooting</a></h2>
+<h2><a name="trouble">Problembehebung</a></h2>

-<p>Sei geduldig - Am Anfang des ersten Starts kann I2P lange brauchen, da es 
-  dann Verbindungen sucht. Falls nach 30 Minuten Deine 
-  "Active: connected/recent" Zahl noch immer weniger als 10 Verbindungen 
-  aufzeigt, solltest Du den I2P Port auf Deiner Firewall &ouml;ffnen um 
-  f&uuml;r bessere Verbindung zu sorgen. Den bei dir benutzten I2P Port 
+<p>Hab Geduld, denn nach dem ersten Start kann I2P noch etwas langsam sein. 
+  Dein Router braucht etwas Zeit, um Verbindungen zu suchen und das Netzwerk kennenzulernen. 
+  Falls nach 30 Minuten die Zahl Deiner aktiven Verbindungen (im Seitenpanel unter 
+  "Teilnehmer", die Zahl hinter "Aktiv:") noch immer geringer als 10 ist,  
+  solltest Du den I2P-Port auf Deiner Firewall &ouml;ffnen, um 
+  f&uuml;r eine bessere Verbindung zu sorgen. Den von I2P bei Dir benutzten Port 
  (bei jeder Installation setzt I2P einen anderen) siehst Du auf der 
  <a href="config.jsp">Konfigurationsseite</a>.
-  Wenn Du gar keine Eepsites bekommst (auch nicht 
-  <a href="http://www.i2p2.i2p/index_de.html">www.i2p2.i2p</a>), stelle sicher, dass Dein 
-  Internet Browser auf den Proxy 127.0.0.1 Port 4444 eingestellt ist.
+  Wenn Du gar keine Eepseiten erreichen kannst (auch nicht 
+  <a href="http://www.i2p2.i2p/index_de.html">www.i2p2.i2p</a>), dann stell sicher, dass Dein 
+  Internet-Browser auf den Proxy 127.0.0.1 Port 4444 eingestellt ist!
  Vielleicht m&ouml;chtest Du auch die Informationen lesen, die auf der 
-  <a href="http://www.i2p2.i2p/index_de.html">I2P website</a> sind, Nachrichten lesen und 
-  ins <a href="http://forum.i2p2.de/">I2P discussion forum</a> posten, oder 
-  chatten auf
-  <a href="irc://127.0.0.1:6668/i2p-help">#i2p-help</a>, <a href="irc://127.0.0.1:6668/i2p-de">#i2p-de</a>, <a href="irc://127.0.0.1:6668/i2p">#i2p</a> oder <a href="irc://127.0.0.1:6668/i2p-chat">#i2p-chat</a>
-  beim IRC auf 
-  <a href="irc://irc.freenode.net/#i2p">irc.freenode.net</a>, irc.postman.i2p 
-  oder irc.freshcoffee.i2p (die verbunden sind).</p><hr />
+  <a href="http://www.i2p2.i2p/index_de.html">I2P-Website</a> stehen, Nachrichten lesen und 
+  im <a href="http://forum.i2p2.de/">I2P-Forum</a> posten, oder 
+  im offiziellen deutschsprachigen Support-Channel
+  <a href="irc://127.0.0.1:6668/i2p-de">#i2p-de</a>, dem offiziellen internationalen Support-Channel 
+  <a href="irc://127.0.0.1:6668/i2p-help">#i2p-help</a>, 
+  in <a href="irc://127.0.0.1:6668/i2p">#i2p</a> oder in <a href="irc://127.0.0.1:6668/i2p-chat">#i2p-chat</a>
+  auf
+  irc.postman.i2p 
+  bzw. irc.freshcoffee.i2p chatten. (Beide unter <a href="irc://localhost:6668">irc://localhost:6668</a> erreichbar; die Server sind verbunden.) Wenn Du keinen Zugriff auf I2P hast, kannst du #i2p, #i2p-help und #i2p-de auch auf <a href="irc://irc.freenode.net/#i2p">irc.freenode.net</a> erreichen, dann allerdings nicht anonym.</p><hr />
+</div>
--- a/installer/resources/readme/readme_es.html
+++ b/installer/resources/readme/readme_es.html
@ -0,0 +1,70 @@
+<div lang="es">
+<div align="right">
+<div class="langbox" align="right"><a href="/index.jsp?lang=en"><img src="/flags.jsp?c=us" title="English" alt="English"></a> <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="中文" alt="中文"></a> <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> <a href="/index.jsp?lang=fr"><img src="/flags.jsp?c=fr" title="Fran&ccedil;ais" alt="Fran&ccedil;ais"></a> <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Espa&ntilde;ol" alt="Espa&ntilde;ol"></a> <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> <a href="/index.jsp?lang=ru"><img src="/flags.jsp?c=ru" title="Русский" alt="Русский"></a> <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
+</div>
+<div class="welcome"><h2>&iexcl;Bienvenido a I2P!</h2></div>
+<p>Si acabas de arrancar I2P los n&uacute;meros a la derecha de "Active:" deber&iacute;an subir en los pr&oacute;ximos minutos y luego ver&aacute;s all&iacute; una Destinaci&oacute;n llamada "shared clients" <br>(si no, <a href="#trouble">&iexcl;mira abajo!</a>) Apenas aparezca esto, puedes:</p>
+<ul>
+ <li><b>visitar p&aacute;ginas I2P ("Eepsites")</b> - En I2P hay p&aacute;ginas web an&oacute;nimas: 
+     Configura tu navegador web para usar el <b>proxy HTTP: 127.0.0.1 puerto 4444</b>, luego visita una p&aacute;gina I2P:<br>
+     <ul class="links">
+         <li><a href="http://forum.i2p/">forum.i2p</a>: Conexi&oacute;n segura y an&oacute;nima a <a href="http://forum.i2p2.de/">forum.i2p2.de</a></li>
+         <li><a href="http://www.i2p2.i2p/index_de.html">www.i2p2.i2p</a> y el espejo <a href="http://i2p-projekt.i2p/index_de.html">i2p-projekt.i2p</a>:
+              Conexiones seguras y an&oacute;nimas a <a href="http://www.i2p2.de/index_de.html">www.i2p2.de</a></li>
+         <li><a href="http://eepsites.i2p/">eepsites.i2p</a>: P&aacute;gina de b&uacute;squeda para p&aacute;ginas I2P</li>
+         <li><a href="http://ugha.i2p/">ugha.i2p</a>: P&aacute;gina de Ugha; un wiki p&uacute;blico con muchos enlaces</li>
+         <li><a href="http://fproxy.tino.i2p">fproxy.tino.i2p</a>: un proxy para acceder Freenet</li>
+	 <li><a href="http://echelon.i2p">echelon.i2p</a>: Archivo de software e informaciones sobre I2P (con aplicaciones de BitTorrent, iMule, I2PFox, I2P-Messenger, ...)</li>
+         <li><a href="http://paste.i2p2.i2p">paste.i2p2.i2p</a>: Pastebin an&oacute;nimo</li>
+	</ul><br />
+     Hay muchas p&aacute;ginas I2P m&aacute;s - simplemente &iexcl;sigue los enlaces que encuentres, pon marcadores para tus favoritos y vis&iacute;talos frecuentemente!</
+     li><br />
+ <li class="tidylist"><b>navegar en internet</b> - En I2P existe un HTTP-"Outproxy". Para poder usarlo, puedes tambi&eacute;n utilizar el proxy HTTP en el puerto 4444 - Si configuras tu navegador web para usar este proxy, puedes visitar las p&aacute;ginas web de forma an&oacute;nima. El tr&aacute;fico ser&aacute; enrutado atrav&eacute;s de la red I2P.</li>
+ <li class="tidylist"><b>intercambiar datos</b> - Hay una<a href="i2psnark/">Adaptaci&oacute;n</a> de la aplicaci&ouml;n <a href="http://www.bittorrent.com/">BitTorrent</a> 
+     <a href="http://www.klomp.org/snark/">Snark</a>.</li>
+ <li class="tidylist"><b>correo electr&oacute;nico an&oacute;nimo</b> - Postman cre&oacute; un sistema de correo electr&oacute;nico que es compatible con las aplicaciones de correo comunes (POP3/SMTP), el cual permite enviar correos electr&oacute;nicos tanto dentro de I2P como recibir y mandar correos de/a internet. Puedes registrar tu cuenta en <a href="http://hq.postman.i2p/">hq.postman.i2p</a>. Junto a esto tenemos <a href="/susimail/susimail">susimail</a>, un cliente an&oacute;nimo de correo que se abre en el navegador web. Ya est&aacute; configurado para el servicio de Postman.<br>Tambi&eacute;n te recomendamos nuestro nuevo sistema de correo electr&oacute;nico sin servidor <a href="http://tjgidoycrw6s3guetge3kvrvynppqjmvqsosmtbmgqasa6vmsf6a.b32.i2p/">I2P-Bote</a>, que existe en forma de plugin. Viene con una interfaz web y cifra todos los mensajes de fin a fin.</li>
+ <li class="tidylist"><b>chat an&oacute;nimo</b> - Lanza tu cliente IRC preferido y con&eacute;ctate con el servidor an&oacute;nimo en 
+     <b>127.0.0.1 puerto 6668</b>.  Esto te llevar&aacute; a uno de dos servidores an&oacute;nimos de IRC 
+     - y ni tu ni los dem&aacute;s usuarios sabr&aacute;n quien es el otro, ni siquiera el administrador del servidor.</li>
+ <li class="tidylist"><b>blog an&oacute;nimo</b> - &iexcl;Prueba <a href="http://syndie.i2p2.de/">Syndie</a>!</li>
+ <li class="tidylist">y mucho m&aacute;s</li>
+</ul>
+
+<h2>&iquest;Quieres tener tu propia p&aacute;gina I2P?</h2>
+
+<p>El paquete I2P contiene programas que te facilitan manejar tu propia p&aacute;gina I2P: Una instancia de  
+<a href="http://jetty.mortbay.org/">Jetty</a> enlaza con 
+<a href="http://127.0.0.1:7658/">http://127.0.0.1:7658/</a>. Simplemente pon tus archivos en la carpeta  
+   <code>eepsite/docroot/</code> (o los servlets/jsp  
+   <code>.war</code> en <code>eepsite/webapps</code>, scripts cgi
+   en <code>eepsite/cgi-bin</code>) y ya est&aacute; disponible tu p&aacute;gina.
+   Despu&eacute;s del arranque del <a href="/i2ptunnel/">t&uacute;nel de la p&aacute;gina I2P</a>,
+   que enlaza con tu servidor, tu p&aacute;gina I2P est&aacute; disponible para otros. 
+   Instrucciones m&aacute;s detalladas sobre c&oacute;mo lanzar tu p&aacute;gina I2P puedes encontrar 
+   en <a href="http://127.0.0.1:7658/">tu p&aacute;gina I2P temporal</a>.
+</p>
+
+<h2><a name="trouble">Problemas</a></h2>
+
+<p>&iexcl;Ten paciencia!, despu&eacute;s del primer arranque, I2P puede ser lento. 
+   Esto se debe a que tu enrutador I2P necesita tiempo para establecer conexiones 
+   con otros enrutadores I2P y para llegar a conocer la red. 
+   Si despu&eacute;s de treinta minutos el n&uacute;mero de tus conexiones activas (&iexcl;vea al lado izquierdo, debajo de "participantes"!) 
+   a&uacute;n sigue menor que diez, deber&iacute;a ver si el puerto que usa I2P est&aacute; abierto en tu cortafuegos, para que tengas una conexi&oacute;n mejor.
+   El puerto que usa tu enrutador I2P (un puerto aleatorio escogido a la hora de la instalaci&oacute;n) puedes ver en 
+   la <a href="config.jsp">P&aacute;gina de configuraci&oacute;n</a>.
+   Si no puedes acceder a ninguna p&aacute;gina I2P (ni siquiera a
+   <a href="http://www.i2p2.i2p/index_de.html">www.i2p2.i2p</a>), &iexcl;aseg&uacute;rate de que tu navegador est&eacute; usando el proxy 
+   127.0.0.1 puerto 4444!
+   Quiz&aacute;s quieras leer la informaci&oacute;n disponible en la 
+   <a href="http://www.i2p2.i2p/index_de.html">P&aacute;gina web de I2P</a>, leer noticias y escribir en el 
+   <a href="http://forum.i2p2.de/">Forum de I2P</a> o 
+   venir a saludarnos en el canal oficial de habla hispana 
+   <a href="irc://127.0.0.1:6668/i2p-es">#i2p-es</a>, el canal oficial en ingl&eacute;s 
+   <a href="irc://127.0.0.1:6668/i2p-help">#i2p-help</a>, en 
+   <a href="irc://127.0.0.1:6668/i2p">#i2p</a> o en <a href="irc://127.0.0.1:6668/i2p-chat">#i2p-chat</a>
+   , todos en los servidores irc.postman.i2p y irc.freshcoffee.i2p. 
+   (Puedes acceder a ambos bajo <a href="irc://localhost:6668">irc://localhost:6668</a>; los dos servidores est&aacute;n conectados.) 
+   Si a&uacute;n no tienes acceso a I2P, tambi&eacute;n puedes entrar en #i2p y #i2p-help del servidor <a href="irc://irc.freenode.net/#i2p">irc.freenode.net</a> - 
+   entonces de forma no an&oacute;nima.</p><hr />
+</div>
--- a/installer/resources/readme/readme_fr.html
+++ b/installer/resources/readme/readme_fr.html
@ -1,8 +1,8 @@
 <div lang="fr">
 <div align="right">
-<div class="langbox" align="right"><a href="/index.jsp?lang=en"><img src="/flags.jsp?c=us" title="English" alt="English"></a> <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="Chinese" alt="Chinese"></a> <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> <a href="/index.jsp?lang=fr"><img src="/flags.jsp?c=fr" title="Fran&ccedil;ais" alt="Fran&ccedil;ais"></a> <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> <a href="/index.jsp?lang=ru"><img src="/flags.jsp?c=ru" title="Русский" alt="Русский"></a> <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
+<div class="langbox" align="right"><a href="/index.jsp?lang=en"><img src="/flags.jsp?c=us" title="English" alt="English"></a> <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="中文" alt="中文"></a> <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> <a href="/index.jsp?lang=fr"><img src="/flags.jsp?c=fr" title="Fran&ccedil;ais" alt="Fran&ccedil;ais"></a> <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Espa&ntilde;ol" alt="Espa&ntilde;ol"></a> <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> <a href="/index.jsp?lang=ru"><img src="/flags.jsp?c=ru" title="Русский" alt="Русский"></a> <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
 </div>
-<div class="welcome"><h2>Bienvenu a I2P!</h2></div>
+<div class="welcome"><h2>Bienvenu sur I2P!</h2></div>
 <p>Si vous venez juste de lancer I2P, les chiffres sur la gauche &agrave; cot&eacute; de Active devraient commencer &agrave; augmenter dans les prochaines minutes et vous verrez un "Shared client" en destination locale list&eacute;s sur la gauche (si non, <a href=#trouble>voir plus bas</a>). Une fois qu'ils apparaissent, vous pouvez:</p>
 <ul>
  <li><b>parcourir les "eepsites"</b> - sur I2P il y a des sites web anonymes h&eacute;berg&eacute;s - dites &agrave; votre navigateur d'utiliser <b>le HTTP proxy a l'adresse 127.0.0.1 port 4444</b>, ensuite vous pouvez naviguer sur les eepsites:<br>
@ -13,7 +13,7 @@
          <li><a href="http://eepsites.i2p/">eepsites.i2p</a>: un moteur de recherche d'eepsites</li>
          <li><a href="http://ugha.i2p/">ugha.i2p</a>: l'eepsite d'ugha, un wiki que chaucun peut &eacute;diter ainsi que</li>
          <li><a href="http://fproxy.tino.i2p">fproxy.tino.i2p</a>: un proxy Freenet 0.5</li>
-	  <li><a href="http://echelon.i2p">echelon.i2p</a>: archive</li>
+	  <li><a href="http://echelon.i2p">echelon.i2p</a>: archive de software (I2PFox, iMule, I2P-Messenger, ...) et informations &agrave; propos de I2P<br></li>
 	  <li><a href="http://paste.i2p2.i2p">paste.i2p2.i2p</a>: Pastebin anonyme</li>
 	  <br>
     </ul>
@ -22,7 +22,9 @@
  <li class="tidylist"><b>Transfer de fichiers</b> - Il y a un <a href="i2psnark/">port</a> int&eacute;gr&eacute; de <a href="http://www.klomp.org/snark/">Snark</a> le client <a href="http://www.bittorrent.com/">BitTorrent</a>.</li>
  <li class="tidylist"><b>Utiliser le service de mail anonyme</b> - Postman a cr&eacute;&eacute; un syt&egrave;me de mails compatible avec un client de messagerie normal (POP3 / SMTP) qui permet d'envoyer des emails autant au sein d'i2p que vers et &agrave; partir de l'internet normal! Cr&eacute;ez-vous un compte &agrave;  <a href="http://hq.postman.i2p/">hq.postman.i2p</a>.
     Nous fournissons dans la version de base de i2p <a href="/susimail/susimail">susimail</a>,
-     un client web pop3/smtp orient&eacute; sur l'anonymat qui est configur&eacute; pour acc&eacute;der aux services email de postman.</li>
+     un client web pop3/smtp orient&eacute; sur l'anonymat qui est configur&eacute; pour acc&eacute;der aux services email de postman. 
+     <br>Alternativement, vous pouvez essayer le nouveau syst&egrave;me de courrier sans serveur et crypt&eacute; de bout-en-bout 
+     <a href="http://tjgidoycrw6s3guetge3kvrvynppqjmvqsosmtbmgqasa6vmsf6a.b32.i2p/">I2P-Bote</a> (avec une interface web), installable comme un plugin.<br></li>
  <li class="tidylist"><b>Chatter de mani&egrave;re anonyme</b> - Activez votre client IRC et connectez-le sur le serveur <b>127.0.0.1 port 6668</b>. Ceci pointe vers l'un des deux serveur IRC anonyme, mais ni vous ni eux ne savent qui est l'autre</li>
  <li class="tidylist"><b>Cr&eacute;ez-vous un blog anonyme</b> - Renseignez-vous chez <a href="http://syndie.i2p2.de/">Syndie</a></li>
  <li class="tidylist">Et bien d'autres</li>
@ -40,4 +42,5 @@
 <p>Soyez patient - i2p peut s'av&eacute;rer lent &agrave; d&eacute;marrer la premi&egrave;re fois car il recherche des pairs. Si, apr&egrave;s 30 minutes, votre Actives: connect&eacute;/r&eacute;cent compte moins de 10 pairs connect&eacute;s, vous devez ouvrir le port 8887 sur votre pare-feu pour avoir une meilleure connection. Si vous ne pouvez acc&eacute;der &agrave; aucun eepsite (m&ecirc;me <a href="http://www.i2p2.i2p/index_fr.html">www.i2p2.i2p</a>), soyez s&ucirc;r que votre navigateur utilise bien le proxy 127.0.0.1 sur le port 4444. Vous pouvez aussi faire part de votre d&eacute;marche sur le <a href="http://www.i2p2.i2p/index_fr.html">site web I2P</a>, poster des message sur le <a href="http://forum.i2p/">forum de discussion</a>,
 ou passer par
 <a href="irc://127.0.0.1:6668/i2p-help">#i2p-help</a>, <a href="irc://127.0.0.1:6668/i2p-fr">#i2p-fr</a>, <a href="irc://127.0.0.1:6668/i2p">#i2p</a> ou <a href="irc://127.0.0.1:6668/i2p-chat">#i2p-chat</a>
- sur IRC sur le serveur <a href="irc://irc.freenode.net/#i2p">irc.freenode.net</a>, irc.postman.i2p ou irc.freshcoffee.i2p (ils sont li&eacute;s).</p><hr />
+ sur IRC sur le serveur <a href="irc://irc.freenode.net/#i2p">irc.freenode.net</a>, irc.postman.i2p ou irc.freshcoffee.i2p (ils sont li&eacute;s).</p><hr />
+</div>
--- a/installer/resources/readme/readme_nl.html
+++ b/installer/resources/readme/readme_nl.html
@ -1,6 +1,6 @@
 <div lang="nl">
 <div align="right">
-<div class="langbox" align="right"><a href="/index.jsp?lang=en"><img src="/flags.jsp?c=us" title="English" alt="English"></a> <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="Chinese" alt="Chinese"></a> <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> <a href="/index.jsp?lang=fr"><img src="/flags.jsp?c=fr" title="Fran&ccedil;ais" alt="Fran&ccedil;ais"></a> <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> <a href="/index.jsp?lang=ru"><img src="/flags.jsp?c=ru" title="Русский" alt="Русский"></a> <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
+<div class="langbox" align="right"><a href="/index.jsp?lang=en"><img src="/flags.jsp?c=us" title="English" alt="English"></a> <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="中文" alt="中文"></a> <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> <a href="/index.jsp?lang=fr"><img src="/flags.jsp?c=fr" title="Fran&ccedil;ais" alt="Fran&ccedil;ais"></a> <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Espa&ntilde;ol" alt="Espa&ntilde;ol"></a> <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> <a href="/index.jsp?lang=ru"><img src="/flags.jsp?c=ru" title="Русский" alt="Русский"></a> <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
 </div>
 <div class="welcome"><h2>Welkom bij I2P!</h2></div>
 <p>Als je net I2P opgestart hebt, zullen de 'Active:' (Actieve) getallen aan de linkerkant in de komende minuten stijgen, en je zal een "Shared clients" (Gedeelde clients) lokale bestemming zien staan aan de linkerkant (indien niet, <a href=#trouble>zie hieronder</a>). Eenmaal je deze bestemming ziet, kan je:</p>
--- a/installer/resources/readme/readme_ru.html
+++ b/installer/resources/readme/readme_ru.html
@ -4,6 +4,7 @@
    <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="中文" alt="中文"></a> 
    <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> 
    <a href="/index.jsp?lang=fr"><img src="/flags.jsp?c=fr" title="Français" alt="Français"></a> 
+    <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Espa&ntilde;ol" alt="Espa&ntilde;ol"></a> 
    <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> 
    <a href="/index.jsp?lang=ru"><img src="/flags.jsp?c=ru" title="Русский" alt="Русский"></a> 
    <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
@ -62,4 +63,5 @@
 <p>Кроме того, Вам может пригодиться справочная информация на <a href="http://www.i2p2.de/">сайте I2P</a>. Не стесняйтесь задать интересующие вас вопросы на <a href="http://forum.i2p2.de/">форуме I2P</a> или на IRC каналах 
 <a href="irc://127.0.0.1:6668/i2p-help">#i2p-help</a>, <a href="irc://127.0.0.1:6668/i2p">#i2p</a> и <a href="irc://127.0.0.1:6668/i2p-chat">#i2p-chat</a>
 на серверах <a href="irc://irc.freenode.net/#i2p">irc.freenode.net</a>, irc.postman.i2p или irc.freshcoffee.i2p (последние два объединены в одну сеть, а на freenode работает бот-ретранслятор).</p>
-<hr>
+<hr>
+</div>
--- a/installer/resources/readme/readme_sv.html
+++ b/installer/resources/readme/readme_sv.html
@ -1,6 +1,6 @@
 <div lang="sv">
 <div align="right">
-<div class="langbox" align="right"><a href="/index.jsp?lang=en"><img src="/flags.jsp?c=us" title="English" alt="English"></a> <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="Chinese" alt="Chinese"></a> <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> <a href="/index.jsp?lang=fr"><img src="/flags.jsp?c=fr" title="Fran&ccedil;ais" alt="Fran&ccedil;ais"></a> <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> <a href="/index.jsp?lang=ru"><img src="/flags.jsp?c=ru" title="Русский" alt="Русский"></a> <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
+<div class="langbox" align="right"><a href="/index.jsp?lang=en"><img src="/flags.jsp?c=us" title="English" alt="English"></a> <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="中文" alt="中文"></a> <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> <a href="/index.jsp?lang=fr"><img src="/flags.jsp?c=fr" title="Fran&ccedil;ais" alt="Fran&ccedil;ais"></a> <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Espa&ntilde;ol" alt="Espa&ntilde;ol"></a> <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> <a href="/index.jsp?lang=ru"><img src="/flags.jsp?c=ru" title="Русский" alt="Русский"></a> <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
 </div>
 <div class="welcome"><h2>Welcome to I2P!</h2></div>
 <p>Om du just har startat I2P kommer de "Aktiva: #/#" b&ouml;rja &ouml;ka inom 
@ -96,4 +96,5 @@ f&ouml;rbi
 <a href="irc://127.0.0.1:6668/i2p-help">#i2p-help</a>, <a href="irc://127.0.0.1:6668/i2p">#i2p</a> eller <a href="irc://127.0.0.1:6668/i2p-chat">#i2p-chat</a>
 p&aring; IRC på <a 
 href="irc://irc.freenode.net/#i2p">irc.freenode.net</a>, irc.postman.i2p 
-eller irc.freshcoffee.i2p (de &auml;r alla sammankopplade).</p><hr />
+eller irc.freshcoffee.i2p (de &auml;r alla sammankopplade).</p><hr />
+</div>
--- a/installer/resources/readme/readme_zh.html
+++ b/installer/resources/readme/readme_zh.html
@ -1,9 +1,10 @@
 <div lang="zh">
 <div align="right"> 
  <div class="langbox" align="right"><a href="/index.jsp?lang=en"><img src="/flags.jsp?c=us" title="English" alt="English"></a> 
-    <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="Chinese" alt="Chinese"></a> 
+    <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="中文" alt="中文"></a> 
    <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> 
    <a href="/index.jsp?lang=fr"><img src="/flags.jsp?c=fr" title="Fran&ccedil;ais" alt="Fran&ccedil;ais"></a> 
+    <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Espa&ntilde;ol" alt="Espa&ntilde;ol"></a> 
    <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> 
    <a href="/index.jsp?lang=ru"><img src="/flags.jsp?c=ru" title="Русский" alt="Русский"></a> 
    <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
--- a/installer/resources/runplain.sh
+++ b/installer/resources/runplain.sh
@ -1,4 +1,5 @@
-#
+#!/bin/sh
+
 # This runs the router by itself, WITHOUT the wrapper.
 # This means the router will not restart if it crashes.
 # Also, you will be using the default memory size, which is
--- a/installer/resources/themes/snark/ubergine/images/details.png
+++ b/installer/resources/themes/snark/ubergine/images/details.png
--- a/installer/resources/themes/snark/ubergine/images/details_nolink.png
+++ b/installer/resources/themes/snark/ubergine/images/details_nolink.png
--- a/installer/resources/themes/snark/ubergine/images/priority.png
+++ b/installer/resources/themes/snark/ubergine/images/priority.png
--- a/installer/resources/themes/snark/ubergine/images/stopped.png
+++ b/installer/resources/themes/snark/ubergine/images/stopped.png
--- a/installer/resources/themes/snark/ubergine/images/up.png
+++ b/installer/resources/themes/snark/ubergine/images/up.png
--- a/installer/resources/themes/snark/ubergine/snark.css
+++ b/installer/resources/themes/snark/ubergine/snark.css
@ -17,7 +17,7 @@ body {
     text-decoration: none !important;
     text-transform: uppercase !important;
     padding: 4px 16px 5px !important;
-	 margin: -5px -7px -5px 0 !important;
+     margin: -5px -8px -5px 0 !important;
     letter-spacing: 0.05em;
     font-weight: bold;
     font-size: 11pt;
@ -43,7 +43,7 @@ body {
     font-size: 11pt;
     color: #f50;
     background: #310 url('/themes/snark/ubergine/images/snarknav_on.png') repeat-x scroll center center;
-     background: url('/themes/snark/ubergine/images/snarknav_lowlight.png') repeat-x scroll center center;
+     background: #310 url('/themes/snark/ubergine/images/snarknav_lowlight.png') repeat-x scroll center center;
     -moz-border-radius: 0;
     -khtml-border-radius: 0;
     border-radius: 0;
@ -65,8 +65,8 @@ body {

 .snarkRefresh:last-child {
     -moz-border-radius: 0 3px 3px 0px;
-	 -khtml-border-radius: 0 3px 0 0;
-	 border-radius: 0;
+     -khtml-border-radius: 0 3px 3px 0;
+     border-radius: 0 3px 3px 0;
     -moz-box-shadow: inset 0 0 1px 0 #f90;
     -khtml-box-shadow: inset 0 0 1px 0 #f90;
     box-shadow: 0 0 1px 0 #f90;
@ -74,8 +74,8 @@ body {

 .snarkRefresh:first-child {
     -moz-border-radius: 3px 0 0 3px;
-	 -khtml-border-radius: 3px;
-	 border-radius: 0;
+     -khtml-border-radius: 3px 0 0 3px;
+     border-radius: 3px 0 0 3px;
     -moz-box-shadow: inset 0 0 1px 0 #f90;
     -khtml-box-shadow: inset 0 0 1px 0 #f90;
     box-shadow: 0 0 1px 0  #f90;
@ -85,7 +85,7 @@ body {
     font: bold 9pt "Lucida Console","DejaVu Sans Mono",Courier,mono !important;
     text-align: left;
     margin: 0 0 10px 0;
-     padding: 3px 0;
+     padding: 3px 5px;
     border-spacing: 0px;
     -moz-border-radius: 4px 0 0 0;
     -khtml-border-radius: 4px 0 0 0;
@ -162,7 +162,6 @@ th {
 th:first-child {
     text-align: left !important;
     padding-left: 2px;
-	 max-width: 120px;
 }

 tfoot td:first-child {
@ -182,6 +181,32 @@ tfoot th {
     padding-bottom: 4px !important;
 }

+.headerstatus {
+     text-align: left;
+     padding-left: 15px;
+}
+
+.headerpriority {
+     text-align: left;
+     padding-left: 10px;
+}
+
+.ParentDir {
+     background: #656;
+     background: #351933;
+     font-size: 8pt;
+     border: 0px inset #101 !important;
+     border-left: 0 !important;
+     border-right: 0 !important;
+     text-align: left !important;
+     padding: 4px 0;
+}
+
+.priority {
+     font-size: 7pt;
+     vertical-align: center;
+}
+
 .SnarkTorrents {
     margin: 0;
     border: 1px solid #101;
@ -191,8 +216,8 @@ tfoot th {
 td {
     padding: 1px;
     color: #ddd !important;
-	 font-size: 9.5pt;
     opacity: 1;
+     font-size: 9.5pt;
 }

 .mainsection td {
@ -201,7 +226,7 @@ td {

 td:first-child {
     text-align: right;
-	 padding-left: 10px;
+     font-size: 9.5pt;
 }

 .snarkTorrentName {
@ -233,13 +258,6 @@ td:first-child {
     background: #202;
 }

-/*
-.snarkTorrentEven tr:first-child {
-	 border: 1px dotted #fff !important;
-}
-
-*/
-
 .snarkTorrentNoneLoaded {
     background: #323;
     font-size: 8.5pt;
@ -254,19 +272,18 @@ td:first-child {

 .snarkTorrentStatus:first-child {
     text-align: left !important;
-     font-style: italic;
     padding-left: 0px;
-     min-width: 92px;
+     min-width: 120px;
     font-weight: bold;
-     font-size: 7pt !important;
     color: #dd9 !important;
+     font-size: 8pt;
 }

 .snarkTorrentStatus:first-child img {
     margin-right: 0px !important;
 }

-.snarkTorrentRate, .snarkTorrentDownloaded, .snarkTorrentUploaded {
+.snarkTorrentRateUp, .snarkTorrentRateDown, .snarkTorrentDownloaded, .snarkTorrentUploaded {
     font-size: 8pt;
     font-weight: bold;
     padding: 0 3px;
@ -280,10 +297,13 @@ td:first-child {
     color: #b9b !important;
 }

-.snarkTorrentRate {
-     color: #d9d !important;
+.snarkTorrentRateUp {
+     color: #b9b !important;
 }

+.snarkTorrentRateDown {
+     color: #76a !important;
+}

 .snarkTorrentOdd {
     background: #656;
@ -298,19 +318,23 @@ td:first-child {
 }

 .snarkFileName {
-/*     min-width: 25em;*/
     padding: 4px 0px !important; 
     text-align: left !important;
+     font-size: 8pt !important;
 }

 .snarkFileSize {
     padding: 4px 2px;
+     font-weight: bold;
+     color: #b6b !important;
 }

 .snarkFileStatus {
-     padding: 4px 10px;
+     padding: 4px 5px 4px 15px;
     text-align: center;
     font-style: italic;
+     font-size: 8pt;
+     text-align: left;
 }

 .snarkTorrentETA {
@ -357,7 +381,7 @@ td:first-child {
 .page {
     background: #323 url('/themes/snark/ubergine/images/tile2.png');
     color: #310;
-     min-width: 880px !important;
+     min-width: 970px !important;
     margin: 5px 0 0 0;
     padding: 10px 10px 0px 10px;
     -moz-border-radius: 4px;
@ -413,13 +437,14 @@ input {
     font-size: 9pt;
     font-weight: bold;
     text-align: left;
-     padding: 2px 4px;
+     padding: 3px 4px !important;
     -moz-border-radius: 4px;
     -khtml-border-radius: 4px;
     border-radius: 4px;
     border: 1px inset #000;
     background: #212 url('/themes/snark/ubergine/images/graytile.png');	 
     color: #f60;
+     margin: 2px 0;
 }

 input.r {
@ -432,6 +457,7 @@ input[type=submit] {
     color: #000;
     background: #989;
     border: 1px inset #bbb;
+     padding: 2px;
 }

 input[type=submit]:hover {
@ -453,6 +479,12 @@ input[type=text]:active, input[type=text]:hover, input.r:hover {
     color: #fff;
 }

+input[type=radio] {
+     padding: 2px;
+     margin: 0 3px 0 8px;
+     vertical-align: bottom;
+}
+
 select {
     background: #333;
     background: url('/themes/snark/ubergine/images/graytile.png') !important;
@ -468,7 +500,7 @@ select {

 select:hover, textarea:hover {
     background: #f60 !important;
-     color: #fff;
+     color: #fff !important;
 }

 textarea {
@ -490,12 +522,29 @@ img {
     line-height: 100%;
 }

-img: hover {
+img:hover {
     border: none;
-     opacity: 0.5;
+     opacity: 1;
     line-height: 100%;
 }

+.infoz {
+     margin: 0 -1px 0 0 !important;
+     padding: 0 !important;
+     lineheight: 100%;
+     float: left;
+}
+
+.infoz img {
+     border: none;
+     opacity: 0.5 !important;
+}
+
+.infoz img:hover {
+     opacity: 1 !important;
+}
+
+
 div.section,div.mainsection {
     margin: 0 0 10px 0;
     padding: 10px;
@ -599,7 +648,7 @@ div.configsection a:hover {
 }

 code {
-     font-size: 9pt;
+     font-size: 9.5pt;
     color: #b8b;
     padding: 0 2px;
     font-weight: bold;
@ -610,8 +659,8 @@ code {
     padding: 11px 10px 12px;
     border: 1px solid #101;
     -moz-border-radius: 0 0 8px 8px;
-     -khtml-border-radius: 0 0 4px 4px;
-     border-radius: 0 0 4px 4px;
+     -khtml-border-radius: 0 0 8px 8px;
+     border-radius: 0 0 8px 8px;
     -moz-box-shadow: inset 0px 0px 1px 0px #002;
     -khtml-box-shadow: inset 0px 0px 1px 0px #002;
     box-shadow: inset 0px 0px 1px 0px #002;
@ -622,7 +671,7 @@ code {
     font-size: 11.5pt;
     color: #001;
     min-width: 700px;
-	 width: 700px;
+     width: 70%;
     text-align: center;
 }

--- a/router/java/src/net/i2p/router/RouterThrottleImpl.java
+++ b/router/java/src/net/i2p/router/RouterThrottleImpl.java
@ -469,7 +469,8 @@ class RouterThrottleImpl implements RouterThrottle {
        if (fiveMinBps > 0) return nowBps - fiveMinBps;
        return 0;
    }
-    private double getBps(Rate rate) {
+
+    private static double getBps(Rate rate) {
        if (rate == null) return -1;
        double bytes = rate.getLastTotalValue();
        return (bytes*1000.0d)/rate.getPeriod(); 
--- 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 = 1;

    /** for example "-test" */
    public final static String EXTRA = "";