diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index 240515e5950dcb0909e4fd29f2eb6c15ada3bb4b..0545b9f55a2930cf14980fb88ae5a454ab5b8451 100644
--- 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 */
diff --git a/apps/i2psnark/java/src/org/klomp/snark/Storage.java b/apps/i2psnark/java/src/org/klomp/snark/Storage.java
index e77d0443242f7f345c33cbb21f93b9aa8af0e46a..3e2a4ad6312771c115b70f98c062e20dac0633dd 100644
--- 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) {
diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
index e9180bef40b3539b9c0e66f1739090de18ad205a..636ea0c376c8bbc81aa00a179571a4dd414d236a 100644
--- 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(" <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) + " / " + 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();
+ 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("\"> ").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>");
+ 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("\"> ")
+ .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("</tr></thead>\n");
+ 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>");
diff --git a/apps/i2psnark/locale/messages_de.po b/apps/i2psnark/locale/messages_de.po
index cdb9c93371605e0942dfebc125dd1ed3e83196ef..968768bb99a14d8472769d724726046172bef781 100644
--- a/apps/i2psnark/locale/messages_de.po
+++ b/apps/i2psnark/locale/messages_de.po
@@ -8,758 +8,821 @@ msgid ""
msgstr ""
"Project-Id-Version: I2P i2psnark\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-08 08:03+0000\n"
-"PO-Revision-Date: 2010-07-08 10:15+0100\n"
-"Last-Translator: echelon <echelon@i2pmail.org>\n"
+"POT-Creation-Date: 2010-11-13 00:19+0000\n"
+"PO-Revision-Date: 2010-11-17 01:02+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/org/klomp/snark/SnarkManager.java:88
+#: ../java/src/org/klomp/snark/SnarkManager.java:90
#, java-format
msgid "Adding torrents in {0} minutes"
-msgstr "Füge Torrents in {0} Minuten hinzu"
+msgstr "Füge Torrents in {0} Minuten hinzu ..."
-#: ../java/src/org/klomp/snark/SnarkManager.java:258
+#: ../java/src/org/klomp/snark/SnarkManager.java:261
#, java-format
msgid "Total uploaders limit changed to {0}"
-msgstr "Totale Anzahl an Uploadslots geändert auf {0}"
+msgstr "Gesamtanzahl an Uploadslots geändert auf {0}"
-#: ../java/src/org/klomp/snark/SnarkManager.java:260
+#: ../java/src/org/klomp/snark/SnarkManager.java:263
#, java-format
msgid "Minimum total uploaders limit is {0}"
-msgstr "Minimale Anzahl and Uploadslots ist {0}"
+msgstr "Minimale Anzahl an Uploadslots ist {0}"
-#: ../java/src/org/klomp/snark/SnarkManager.java:272
+#: ../java/src/org/klomp/snark/SnarkManager.java:275
#, java-format
msgid "Up BW limit changed to {0}KBps"
-msgstr "Upload Bandbreite wurde geändert auf {0}kbyte/s"
+msgstr "Upload Bandbreite wurde auf {0}kbyte/s geändert."
-#: ../java/src/org/klomp/snark/SnarkManager.java:274
+#: ../java/src/org/klomp/snark/SnarkManager.java:277
#, java-format
msgid "Minimum up bandwidth limit is {0}KBps"
-msgstr "Minimales upload Bandbreiten Limit ist {0} kbyte/s"
+msgstr "Minimales Limit der Upload-Bandbreite ist {0} kbyte/s."
-#: ../java/src/org/klomp/snark/SnarkManager.java:286
+#: ../java/src/org/klomp/snark/SnarkManager.java:289
#, java-format
msgid "Startup delay limit changed to {0} minutes"
-msgstr "Startverzögerung geändert auf {0} Minuten"
+msgstr "Startverzögerung auf {0} Minuten gesetzt"
-#: ../java/src/org/klomp/snark/SnarkManager.java:333
+#: ../java/src/org/klomp/snark/SnarkManager.java:336
msgid "I2CP and tunnel changes will take effect after stopping all torrents"
msgstr "Änderungen an I2CP und am Tunnel werden nach dem Stoppen aller Torrents wirksam"
-#: ../java/src/org/klomp/snark/SnarkManager.java:339
+#: ../java/src/org/klomp/snark/SnarkManager.java:343
msgid "Disconnecting old I2CP destination"
msgstr "Trenne das alte I2CP Ziel"
-#: ../java/src/org/klomp/snark/SnarkManager.java:343
+#: ../java/src/org/klomp/snark/SnarkManager.java:347
#, java-format
msgid "I2CP settings changed to {0}"
msgstr "I2CP Einstellungen geändert auf {0}"
-#: ../java/src/org/klomp/snark/SnarkManager.java:347
+#: ../java/src/org/klomp/snark/SnarkManager.java:351
msgid "Unable to connect with the new settings, reverting to the old I2CP settings"
-msgstr "Konnte nicht mit den neuen Einstellungen verbinden, benutze wieder die alten I2CP Einstellungen"
+msgstr "Verbinden mit den neuen Einstellungen nicht möglich, benutze wieder die alten I2CP-Einstellungen"
-#: ../java/src/org/klomp/snark/SnarkManager.java:351
+#: ../java/src/org/klomp/snark/SnarkManager.java:355
msgid "Unable to reconnect with the old settings!"
-msgstr "Konnte nicht mit den alten Einstellungen verbinden!"
+msgstr "Verbinden mit den alten Einstellungen nicht möglich!"
-#: ../java/src/org/klomp/snark/SnarkManager.java:353
+#: ../java/src/org/klomp/snark/SnarkManager.java:357
msgid "Reconnected on the new I2CP destination"
-msgstr "Verbunden auf dem neuem I2CP Ziel"
+msgstr "Verbunden auf dem neuem I2CP-Ziel"
-#: ../java/src/org/klomp/snark/SnarkManager.java:364
+#: ../java/src/org/klomp/snark/SnarkManager.java:368
#, java-format
msgid "I2CP listener restarted for \"{0}\""
-msgstr "I2CP Verbindung neu gestartet für \"{0}\""
+msgstr "I2CP-Verbindung neu gestartet für \"{0}\""
-#: ../java/src/org/klomp/snark/SnarkManager.java:375
+#: ../java/src/org/klomp/snark/SnarkManager.java:379
msgid "Enabled autostart"
msgstr "Aktiviere Autostart"
-#: ../java/src/org/klomp/snark/SnarkManager.java:377
+#: ../java/src/org/klomp/snark/SnarkManager.java:381
msgid "Disabled autostart"
msgstr "Deaktiviere Autostart"
-#: ../java/src/org/klomp/snark/SnarkManager.java:383
+#: ../java/src/org/klomp/snark/SnarkManager.java:387
msgid "Enabled open trackers - torrent restart required to take effect."
-msgstr "Open Tracker aktiviert - zum aktiv werden müssen die Torrents neu gestartet werden"
+msgstr "OpenTracker aktiviert - Um dies anzuwenden, müssen die Torrents neu gestartet werden."
-#: ../java/src/org/klomp/snark/SnarkManager.java:385
+#: ../java/src/org/klomp/snark/SnarkManager.java:389
msgid "Disabled open trackers - torrent restart required to take effect."
-msgstr "Open Tracker deaktiviert - zum aktiv werden müssen die Torrents neu gestartet werden"
+msgstr "OpenTracker deaktiviert - Um dies anzuwenden, müssen die Torrents neu gestartet werden."
-#: ../java/src/org/klomp/snark/SnarkManager.java:392
+#: ../java/src/org/klomp/snark/SnarkManager.java:396
msgid "Open Tracker list changed - torrent restart required to take effect."
-msgstr "Open Tracker Liste geändert - zum aktiv werden müssen die Torrents neu gestartet werden"
+msgstr "OpenTracker-Liste geändert - Um dies anzuwenden, müssen die Torrents neu gestartet werden"
-#: ../java/src/org/klomp/snark/SnarkManager.java:399
+#: ../java/src/org/klomp/snark/SnarkManager.java:403
msgid "Configuration unchanged."
msgstr "Konfiguration nicht geändert."
-#: ../java/src/org/klomp/snark/SnarkManager.java:409
+#: ../java/src/org/klomp/snark/SnarkManager.java:413
#, java-format
msgid "Unable to save the config to {0}"
-msgstr "Konnte Konfiguration nicht nach {0} sichern"
+msgstr "Konnte Konfiguration nicht in {0} speichern"
-#: ../java/src/org/klomp/snark/SnarkManager.java:445
+#: ../java/src/org/klomp/snark/SnarkManager.java:452
msgid "Connecting to I2P"
msgstr "Verbinde mit I2P"
-#: ../java/src/org/klomp/snark/SnarkManager.java:448
+#: ../java/src/org/klomp/snark/SnarkManager.java:455
msgid "Error connecting to I2P - check your I2CP settings!"
msgstr "Fehler beim Verbinden mit I2P - Kontrollieren Sie die I2CP EInstellungen!"
-#: ../java/src/org/klomp/snark/SnarkManager.java:457
+#: ../java/src/org/klomp/snark/SnarkManager.java:464
#, java-format
msgid "Error: Could not add the torrent {0}"
msgstr "Fehler: Konnte den Torrent nicht hinzufügen {0}"
#. catch this here so we don't try do delete it below
-#: ../java/src/org/klomp/snark/SnarkManager.java:479
+#: ../java/src/org/klomp/snark/SnarkManager.java:486
#, java-format
msgid "Cannot open \"{0}\""
-msgstr "Kann folgendes nicht öffnen: \"{0}\""
+msgstr "Kann dies nicht öffnen: \"{0}\""
-#: ../java/src/org/klomp/snark/SnarkManager.java:492
+#: ../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 "Warnung - ignoriere nicht-I2P Tracker in \"{0}\", publiziere nur zu I2P Open Tracker"
+msgstr "Warnung - Ignoriere nicht-I2P Tracker in \"{0}\", werde nur bei I2P-OpenTrackern bekanntgeben"
-#: ../java/src/org/klomp/snark/SnarkManager.java:494
+#: ../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 "Warnung - Ignoriere nicht-I2P Tracker in \"{0}\" und Open Tracker sind deaktiviert, Sie müssen Open Tracker aktivieren bevor sie den Torrent starten!"
+msgstr "Warnung - Ignoriere nicht-I2P Tracker in \"{0}\" und OpenTracker sind deaktiviert. Sie müssen OpenTracker aktivieren, bevor Sie den Torrent starten!"
-#: ../java/src/org/klomp/snark/SnarkManager.java:513
+#: ../java/src/org/klomp/snark/SnarkManager.java:521
#, java-format
msgid "Torrent in \"{0}\" is invalid"
msgstr "Torrent in \"{0}\" ist nicht gültig"
-#: ../java/src/org/klomp/snark/SnarkManager.java:528
+#: ../java/src/org/klomp/snark/SnarkManager.java:536
#, java-format
msgid "Torrent added and started: \"{0}\""
msgstr "Torrent hinzugefügt und gestartet: \"{0}\""
-#: ../java/src/org/klomp/snark/SnarkManager.java:530
+#: ../java/src/org/klomp/snark/SnarkManager.java:538
#, java-format
msgid "Torrent added: \"{0}\""
msgstr "Torrent hinzugefügt: \"{0}\""
-#: ../java/src/org/klomp/snark/SnarkManager.java:627
+#: ../java/src/org/klomp/snark/SnarkManager.java:692
#, java-format
msgid "Too many files in \"{0}\" ({1}), deleting it!"
-msgstr "Zu viele Dateien in \"{0}\" ({1}), lösche es! "
+msgstr "Zu viele Dateien in \"{0}\" ({1}), wird gelöscht! "
-#: ../java/src/org/klomp/snark/SnarkManager.java:629
+#: ../java/src/org/klomp/snark/SnarkManager.java:694
#, java-format
msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
-msgstr "Torrent Datei \"{0}\" darf nicht mit '.torrent' enden, lösche es!"
+msgstr "Torrentdatei \"{0}\" darf nicht mit '.torrent' enden, wird gelöscht!"
-#: ../java/src/org/klomp/snark/SnarkManager.java:631
+#: ../java/src/org/klomp/snark/SnarkManager.java:696
#, java-format
msgid "No pieces in \"{0}\", deleting it!"
-msgstr "Keine Teile in \"{0}\", entferne es!"
+msgstr "Keine Teile in \"{0}\", wird entfernt!"
-#: ../java/src/org/klomp/snark/SnarkManager.java:633
+#: ../java/src/org/klomp/snark/SnarkManager.java:698
#, java-format
msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
-msgstr "Zu viele Teile in \"{0}\" , das Limit sind {1}, lösche es!"
+msgstr "Zu viele Teile in \"{0}\" , das Limit sind {1}, werden gelöscht!"
-#: ../java/src/org/klomp/snark/SnarkManager.java:635
+#: ../java/src/org/klomp/snark/SnarkManager.java:700
#, java-format
msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
-msgstr "Teile sind zu Groß in \"{0}\" ({1}B), lösche es."
+msgstr "Teile sind zu groß in \"{0}\" ({1}B), lösche es."
-#: ../java/src/org/klomp/snark/SnarkManager.java:636
+#: ../java/src/org/klomp/snark/SnarkManager.java:701
#, java-format
msgid "Limit is {0}B"
msgstr "Limit ist \"{0}\"Byte"
-#: ../java/src/org/klomp/snark/SnarkManager.java:644
+#: ../java/src/org/klomp/snark/SnarkManager.java:709
#, java-format
msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
-msgstr "Torrents größer als \"{0}\"Bytes werden nicht unterstützt, lösche \"{1}\""
+msgstr "Torrents größer als \"{0}\"Bytes werden nicht unterstützt, lösche \"{1}\"."
-#: ../java/src/org/klomp/snark/SnarkManager.java:660
+#: ../java/src/org/klomp/snark/SnarkManager.java:725
#, java-format
msgid "Error: Could not remove the torrent {0}"
-msgstr "Fehler: konnte den torrent \"{0}\" nicht entfernen"
+msgstr "Fehler: Konnte den Torrent \"{0}\" nicht entfernen"
-#: ../java/src/org/klomp/snark/SnarkManager.java:681
+#: ../java/src/org/klomp/snark/SnarkManager.java:746
#, java-format
msgid "Torrent stopped: \"{0}\""
msgstr "Torrent angehalten:\"{0}\""
-#: ../java/src/org/klomp/snark/SnarkManager.java:696
+#: ../java/src/org/klomp/snark/SnarkManager.java:761
#, java-format
msgid "Torrent removed: \"{0}\""
msgstr "Torrent entfernt:\"{0}\""
-#: ../java/src/org/klomp/snark/SnarkManager.java:729
+#: ../java/src/org/klomp/snark/SnarkManager.java:799
#, java-format
-msgid "Download finished: \"{0}\""
-msgstr "Download beendet:\"{0}\""
+msgid "Download finished: {0}"
+msgstr "vollständig heruntergeladen:\"{0}\""
-#: ../java/src/org/klomp/snark/SnarkManager.java:729
+#: ../java/src/org/klomp/snark/SnarkManager.java:799
#, java-format
msgid "size: {0}B"
msgstr "Größe: {0}Byte"
-#: ../java/src/org/klomp/snark/SnarkManager.java:757
+#: ../java/src/org/klomp/snark/SnarkManager.java:827
msgid "Unable to connect to I2P!"
-msgstr "Konnte nicht mit I2P verbinden!"
+msgstr "Konnte mich nicht mit I2P verbinden!"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:174
+#: ../java/src/org/klomp/snark/SnarkManager.java:833
+#, java-format
+msgid "Unable to add {0}"
+msgstr "Konnte {0} nicht hinzufügen."
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:176
msgid "I2PSnark - Anonymous BitTorrent Client"
-msgstr "I2PSnark - Anonymer BitTorrent Klient"
+msgstr "I2PSnark - Anonymer BitTorrent-Klient"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:185
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:187
msgid "Torrents"
msgstr "Torrents"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:187
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:193
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:837
+#: ../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:191
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:194
msgid "Refresh page"
msgstr "Aktualisiere Seite"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:195
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:199
msgid "Forum"
msgstr "Forum"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:240
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1289
+#: ../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 "Status"
+msgstr "Zustand"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:246
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:255
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:257
msgid "Hide Peers"
-msgstr "Verstecke Teilnehmer"
+msgstr "Teilnehmer ausblenden"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:249
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:262
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:264
msgid "Show Peers"
-msgstr "Zeige Teilnehmer"
+msgstr "Teilnehmer einblenden"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:254
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+#: ../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:256
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:276
+msgid "Estimated Download Time"
+msgstr "geschätzte verbleibende Zeit bis zur Fertigstellung"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:278
msgid "ETA"
-msgstr "ETA"
+msgstr "Fertig in"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:258
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:281
msgid "Downloaded"
msgstr "Heruntergeladen"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:260
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:283
+msgid "RX"
+msgstr "Heruntergeladen"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:286
msgid "Uploaded"
-msgstr "Hochgeladen"
+msgstr "hochgeladen"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:262
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:288
+msgid "TX"
+msgstr "hochgeladen"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:291
msgid "Down Rate"
-msgstr "Down Rate"
+msgstr "eingehend"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:264
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:293
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:298
+msgid "Rate"
+msgstr "Ãœbertragung"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:296
msgid "Up Rate"
-msgstr "Up Rate"
+msgstr "ausgehend"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:271
+#: ../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 "Stoppe alle Torrents und den I2P Tunnel"
+msgstr "Stoppe alle Torrents und den I2P-Tunnel"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:309
msgid "Stop All"
msgstr "Stoppe alle"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:278
+#: ../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 "Starte alle Torrents und den I2P Tunnel"
+msgstr "Starte alle Torrents und den I2P-Tunnel"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:280
-msgid "Start All"
-msgstr "Starte alle"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:297
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:336
msgid "No torrents loaded."
-msgstr "Keine Torrents geladen."
+msgstr "keine Torrents geladen"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:302
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:341
msgid "Totals"
-msgstr "Total"
+msgstr "Gesamt"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:304
+#: ../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:307
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:346
#, java-format
msgid "1 connected peer"
msgid_plural "{0} connected peers"
msgstr[0] "1 verbundener Teilnehmer"
msgstr[1] "{0} verbundene Teilnehmer"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:336
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:375
#, java-format
msgid "Torrent file {0} does not exist"
-msgstr "Torrent Datei {0} existiert nicht"
+msgstr "Torrentdatei {0} existiert nicht"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:346
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1476
+#: ../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 rennt schon: {0}"
+msgstr "Torrent läuft schon: {0}"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:348
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1478
+#: ../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 ist schon in der Queue: {0}"
+msgstr "Torrent ist schon in der Warteschlange: {0}"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:352
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:391
#, java-format
msgid "Copying torrent to {0}"
msgstr "Kopiere Torrent nach {0}"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:355
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:394
#, java-format
msgid "Unable to copy the torrent to {0}"
msgstr "Konnte den Torrent nicht nach {0} kopieren"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:355
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:394
#, java-format
msgid "from {0}"
msgstr "von {0}"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:363
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:402
#, java-format
msgid "Fetching {0}"
msgstr "Hole {0}"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:367
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:406
msgid "Invalid URL - must start with http://"
-msgstr "Ungültige URL - muß mit http:// anfangen"
+msgstr "Ungültige URL - muss mit http:// anfangen"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:397
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:436
#, java-format
msgid "Starting up torrent {0}"
msgstr "Starte Torrent {0}"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:417
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:435
+#: ../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 "Torrent Datei gelöscht: {0}"
+msgstr "Torrentdatei gelöscht: {0}"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:441
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451
+#: ../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 "Daten Datei gelöscht: {0}"
+msgstr "Daten gelöscht: {0}"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:443
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:453
+#: ../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 "Datendatei konnte nicht gelöscht werden: {0}"
+msgstr "Daten konnten nicht gelöscht werden: {0}"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:462
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:501
#, java-format
msgid "Data dir deleted: {0}"
msgstr "Datenverzeichnis wurde gelöscht: {0}"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:494
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:533
msgid "Error creating torrent - you must select a tracker"
-msgstr "Fehler beim Erstellen des Torrent - Sie müssen einen Tracker auswählen"
+msgstr "Fehler beim Erstellen des Torrents - Sie müssen einen Tracker auswählen"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:548
#, java-format
msgid "Torrent created for \"{0}\""
msgstr "Torrent erstellt für \"{0}\""
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512
+#: ../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 "Viele I2P Tracker erfordern eine Registrierung bevor der Torrent verteilt wird - bitte machen Sie dieses vor dem Start von \"{0}\""
+msgstr "Viele I2P-Tracker erfordern eine Registrierung, bevor der Torrent verteilt wird. Bitte tun Sie dies vor dem Start von \"{0}\"!"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:514
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:553
#, java-format
msgid "Error creating a torrent for \"{0}\""
-msgstr "Fehler beim Erstellen eines Torrent für \"{0}\""
+msgstr "Fehler beim Erstellen eines Torrents für \"{0}\""
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:517
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:556
#, java-format
msgid "Cannot create a torrent for the nonexistent data: {0}"
-msgstr "Kann keinen Torrent für nicht existierende Daten erstellen: {0}"
+msgstr "Kann keinen Torrent für nicht existente Daten erstellen: {0}"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:520
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:559
msgid "Error creating torrent - you must enter a file or directory"
-msgstr "Fehler beim Erstellen des Torrent - Sie müssen eine Datei oder Verzeichnis angeben."
+msgstr "Fehler beim Erstellen des Torrents - Sie müssen eine Datei oder ein Verzeichnis angeben."
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:523
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:562
msgid "Stopping all torrents and closing the I2P tunnel."
-msgstr "Stoppt alle Torrents und beendet den I2P Tunnel."
+msgstr "Stoppe alle Torrents und beende den I2P-Tunnel."
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:532
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:573
msgid "I2P tunnel closed."
-msgstr "I2P Tunnel geschlossen."
+msgstr "I2P-Tunnel geschlossen."
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:576
msgid "Opening the I2P tunnel and starting all torrents."
-msgstr "Öffnet den I2P Tunnel und startet alle Torrents."
+msgstr "Öffne den I2P-Tunnel und starte alle Torrents."
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:657
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:851
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:915
msgid "Unknown"
msgstr "Unbekannt"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:660
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:665
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:670
-msgid "TrackerErr"
-msgstr "TrackerFehler"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:666
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:677
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:688
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:691
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:696
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:699
+#: ../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 "Trackerfehler"
+
+#: ../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 Teilnehmer"
-msgstr[1] "{0} Teilnehmer"
+msgstr[1] "{0} Teilnehmern"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:674
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:679
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:717
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:722
msgid "Seeding"
msgstr "Verteile"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:682
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1327
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:726
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1427
msgid "Complete"
-msgstr "Komplett"
+msgstr "vollständig"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:685
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:690
-msgid "OK"
-msgstr "OK"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:729
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:734
+msgid "Downloading"
+msgstr "lade herunter"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:693
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:738
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:743
msgid "Stalled"
-msgstr "Gedrosselt"
+msgstr "Stillstand"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:701
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:747
msgid "No Peers"
-msgstr "Keine Teilnehmer"
+msgstr "keine Teilnehmer"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:703
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:751
msgid "Stopped"
-msgstr "Gestoppt"
+msgstr "Angehalten"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:718
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:766
msgid "View files"
-msgstr "Betrachte Dateien"
+msgstr "Zeige Dateien"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:720
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:768
msgid "Open file"
msgstr "Öffne Datei"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:750
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:967
+#: ../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:751
-msgid "Details"
-msgstr "Details"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:785
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:836
msgid "Stop the torrent"
msgstr "Stoppe den Torrent"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:787
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:838
msgid "Stop"
-msgstr "Stop"
+msgstr "Stopp"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:793
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:845
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:848
msgid "Start the torrent"
msgstr "Starte den Torrent"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:795
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:850
msgid "Start"
msgstr "Start"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:800
+#: ../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 "Entfernt den Torrent von der aktiven Liste und löscht die .torrent Datei"
+msgstr "Entfernt den Torrent von der aktiven Liste und löscht die .torrent-Datei"
#. Can't figure out how to escape double quotes inside the onclick string.
#. Single quotes in translate strings with parameters must be doubled.
#. Then the remaining single quite must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:805
+#: ../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 "Sind Sie sicher, das Sie die Datei \\''{0}.torrent\\'' löschen wollen (heruntergeladene Daten werden nicht gelöscht)?"
+msgstr "Sind Sie sicher, dass Sie die Datei \\''{0}.torrent\\'' löschen wollen? (Heruntergeladene Daten werden nicht gelöscht.)"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:807
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866
msgid "Remove"
msgstr "Entfernen"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
+#: ../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 "Löscht die .torrent Datei und dazugehörigen Daten Datei(en)"
+msgstr "Löscht die .torrent-Datei und dazugehörige Daten Datei(en)"
#. Can't figure out how to escape double quotes inside the onclick string.
#. Single quotes in translate strings with parameters must be doubled.
#. Then the remaining single quite must be escaped
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:816
+#: ../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 "Sind Sie sicher, das die die Torrentdatei \\''{0}\\'' und alle heruntergeladene Daten löschen wollen?"
+msgstr "Sind Sie sicher, dass Sie die Torrentdatei \\''{0}\\'' und alle heruntergeladenen Daten löschen wollen?"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:818
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:881
msgid "Delete"
msgstr "Löschen"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:861
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:925
msgid "Seed"
msgstr "Quelle"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:879
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:943
msgid "Uninteresting (The peer has no pieces we need)"
-msgstr "Uninteressiert (Der Teilnehmer hat keine Teile die wir benötigen)"
+msgstr "Uninteressant (Der Teilnehmer hat keine Teile, die wir benötigen)"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:881
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:945
msgid "Choked (The peer is not allowing us to request pieces)"
-msgstr "Gedrosselt (der Teilnehmer hat uns nicht erlaubt Teile anzufordern)"
+msgstr "Gedrosselt (Der Teilnehmer hat uns nicht erlaubt, Teile anzufordern)"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:895
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:959
msgid "Uninterested (We have no pieces the peer needs)"
-msgstr "Uninteressiert (Wir haben keine Teile die der Teilnehmer benötigt)"
+msgstr "Uninteressiert (Wir haben keine Teile, die der Teilnehmer benötigt)"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:897
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:961
msgid "Choking (We are not allowing the peer to request pieces)"
-msgstr "Gedrosselt (Wir erlauben dem Teilnehmer nicht Teile anzufordern)"
+msgstr "Gedrosselt (Wir erlauben dem Teilnehmer nicht, Teile anzufordern)"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:927
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1005
msgid "Add Torrent"
-msgstr "Füge Torrent hinzu"
+msgstr "Torrent hinzufügen"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:929
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1007
msgid "From URL"
-msgstr "Quell URL"
+msgstr "Quell-URL"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:934
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1010
+msgid "Torrent file must originate from an I2P-based tracker"
+msgstr "Die Torrentdatei muss von einem Tracker in I2P stammen."
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1015
msgid "Add torrent"
msgstr "Füge Torrent hinzu"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:937
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1018
#, java-format
-msgid "Alternately, you can copy .torrent files to the directory {0}."
-msgstr "Alternativ können Sie die .torrent Dateien auch nach {0} kopieren."
+msgid "You can also copy .torrent files to: {0}."
+msgstr "Alternativ können Sie die .torrent-Dateien auch nach {0} kopieren."
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:939
-msgid "Removing a .torrent file will cause the torrent to stop."
-msgstr "Entfernen der .torrent Datei stoppt einen Torrent."
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1020
+msgid "Removing a .torrent will cause it to stop."
+msgstr "Das Entfernen der .torrent-Datei stoppt den jeweiligen Torrent."
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1040
msgid "Create Torrent"
-msgstr "Erstelle einen Torrent"
+msgstr "Torrent erstellen"
#. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\" value=\"" + newFile + "\" /><br>\n");
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:961
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043
msgid "Data to seed"
msgstr "Daten zum Verteilen"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:965
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1047
msgid "File or directory to seed (must be within the specified path)"
-msgstr "Datei oder Verzeichnis zum Verteilen (muß im angegebenen Pfad sein)"
+msgstr "Datei oder Verzeichnis zum Verteilen (muss im angegebenen Pfad sein)"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:969
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1051
msgid "Select a tracker"
msgstr "Wähle einen Tracker"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:982
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1064
msgid "or"
msgstr "oder"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1067
msgid "Specify custom tracker announce URL"
-msgstr "Geben Sie eine Tracker Announce URL an"
+msgstr "Geben Sie eine Tracker-Announce-URL an!"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:988
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1070
msgid "Create torrent"
msgstr "Erstelle Torrent"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1006
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1133
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1089
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1213
msgid "Configuration"
msgstr "Einstellungen"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1009
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1092
msgid "Data directory"
-msgstr "Daten Verzeichnis"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1012
-msgid "Directory to store torrents and data"
-msgstr "Verzeichnis zum speichern von Torrent Dateien und Daten"
+msgstr "Datenverzeichnis"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
msgid "Edit i2psnark.config and restart to change"
-msgstr "Editiere i2psnark.config zum ändern und starte neu."
+msgstr "Zum Ändern bearbeite die i2psnark.config und starte neu!"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1018
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1098
msgid "Auto start"
-msgstr "Auto Start"
+msgstr "Autostart"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1102
msgid "If checked, automatically start torrents that are added"
-msgstr "Wenn markiert werden hinzugefügte Torrents automatisch gestartet."
+msgstr "Wenn markiert, werden hinzugefügte Torrents automatisch gestartet."
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1026
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1106
msgid "Startup delay"
msgstr "Startverzögerung"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1028
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1108
msgid "minutes"
msgstr "Minuten"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1052
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1132
msgid "Total uploader limit"
-msgstr "Totales Uploader Limit."
+msgstr "Gesamtlimit an Hochladern."
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1135
msgid "peers"
msgstr "Teilnehmer"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1059
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1139
msgid "Up bandwidth limit"
-msgstr "Upload Bandbreiten Limit."
+msgstr "Bandbreitenbegrenzung beim Hochladen."
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1062
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142
msgid "Half available bandwidth recommended."
-msgstr "Halbe verfügbare Bandbreite ist empfohlen."
+msgstr "Halbe verfügbare Bandbreite wird empfohlen."
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1064
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1144
msgid "View or change router bandwidth"
-msgstr "Router Bandbreite ansehen oder ändern"
+msgstr "Routerbandbreite ansehen oder ändern"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1148
msgid "Use open trackers also"
-msgstr "Benutze auch Open Tracker"
+msgstr "Benutze auch OpenTracker"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1072
+#: ../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 "Wenn markiert wird der Torrent neben dem angegebenen Tracker auch bei den Open Trackers bekannt gegeben."
+msgstr "Wenn markiert, wird der Torrent neben dem angegebenen Tracker auch bei den OpenTrackern bekannt gegeben."
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1076
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1156
msgid "Open tracker announce URLs"
-msgstr "Open Tracker Announce URL"
+msgstr "OpenTracker-Announce-URL"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1088
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
msgid "Inbound Settings"
-msgstr "Eingangseinstellungen"
+msgstr "Einstellungen eingehend"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1174
msgid "Outbound Settings"
-msgstr "Ausgangseinstellungen"
+msgstr "Einstellungen ausgehend"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1101
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1181
msgid "I2CP host"
-msgstr "I2CP Host"
+msgstr "I2CP-Host"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1106
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1186
msgid "I2CP port"
-msgstr "I2CP Port"
+msgstr "I2CP-Port"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1118
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1198
msgid "I2CP options"
-msgstr "I2CP Optionen"
+msgstr "I2CP-Optionen"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1124
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1203
msgid "Save configuration"
-msgstr "Speichere Einstellungen"
+msgstr "Einstellungen speichern"
#. * dummies for translation
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1141
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1221
#, java-format
msgid "1 hop"
msgid_plural "{0} hops"
msgstr[0] "1 Zwischenstation"
msgstr[1] "{0} Zwischenstationen"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142
+#: ../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} Tunnel"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1283
-msgid "Up to higher level directory"
-msgstr "Eine Hierachie nach oben"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1371
msgid "File"
msgstr "Datei"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1374
+msgid "FileSize"
+msgstr "Größe"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1374
msgid "Size"
msgstr "Größe"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1311
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1377
+msgid "Download Status"
+msgstr "Zustand"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1381
+msgid "Priority"
+msgstr "Priorität"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1386
+msgid "Up to higher level directory"
+msgstr "Eine Hierarchie nach oben"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1411
msgid "Directory"
-msgstr "Daten Verzeichnis"
+msgstr "Verzeichnis"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1316
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1416
msgid "Torrent not found?"
msgstr "Torrentdatei nicht gefunden?"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1324
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1424
msgid "File not found in torrent?"
msgstr "Datei nicht gefunden im Torrent?"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1330
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1431
msgid "complete"
-msgstr "Komplett"
+msgstr "vollständig"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1331
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1432
msgid "bytes remaining"
-msgstr "Bytes noch übrig"
+msgstr "Bytes ausstehend"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1483
+msgid "High"
+msgstr "hoch"
+
+#: ../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 "ignoriere"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502
+msgid "Save priorities"
+msgstr "Prioritäten speichern"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1456
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1609
#, java-format
msgid "Torrent fetched from {0}"
msgstr "Torrent geholt von {0}"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1484
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1637
#, java-format
msgid "Torrent at {0} was not valid"
-msgstr "Torrent bei {0} war nicht gültig"
+msgstr "Torrent in {0} war nicht gültig"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1642
#, java-format
msgid "Torrent was not retrieved from {0}"
msgstr "Torrent wurde nicht geladen von {0}"
+#~ msgid "Directory to store torrents and data"
+#~ msgstr "Verzeichnis zum Speichern von Torrentdateien und Daten"
+#~ msgid "Do not download"
+#~ msgstr "nicht herunterladen"
+#~ msgid "Start All"
+#~ msgstr "Starte alle"
+#~ msgid "OK"
+#~ msgstr "OK"
+#~ msgid "Details"
+#~ msgstr "Details"
#~ msgid "Cannot change the I2CP settings while torrents are active"
#~ msgstr ""
#~ "Kann nicht die I2CP Einstellungen ändern während Torrents aktiv sind."
diff --git a/apps/i2psnark/locale/messages_fr.po b/apps/i2psnark/locale/messages_fr.po
new file mode 100644
index 0000000000000000000000000000000000000000..45cb9611deba40af3dbc43dbde2314554f2bd3b1
--- /dev/null
+++ 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"
+
diff --git a/apps/i2psnark/locale/messages_ru.po b/apps/i2psnark/locale/messages_ru.po
index ab072853e0b6ff2305ceaa73677bc420072c0d0f..579403a9474251dde1bc9e0f9edb02651c2463cc 100644
--- a/apps/i2psnark/locale/messages_ru.po
+++ b/apps/i2psnark/locale/messages_ru.po
@@ -8,298 +8,323 @@ msgid ""
msgstr ""
"Project-Id-Version: I2P i2psnark\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 21:02+0000\n"
-"PO-Revision-Date: 2010-06-26 21:13+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 21:18+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"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-#: ../java/src/org/klomp/snark/SnarkManager.java:88
+#: ../java/src/org/klomp/snark/SnarkManager.java:90
#, java-format
msgid "Adding torrents in {0} minutes"
msgstr "Торренты будут подгружены через {0} минут(ы)"
-#: ../java/src/org/klomp/snark/SnarkManager.java:258
+#: ../java/src/org/klomp/snark/SnarkManager.java:261
#, java-format
msgid "Total uploaders limit changed to {0}"
msgstr "Ðовое значение лимита количеÑтва Ñлотов отдачи: {0}"
-#: ../java/src/org/klomp/snark/SnarkManager.java:260
+#: ../java/src/org/klomp/snark/SnarkManager.java:263
#, java-format
msgid "Minimum total uploaders limit is {0}"
msgstr "Минимально допуÑтимое значение Ð´Ð»Ñ ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑтва Ñлотов: {0}"
-#: ../java/src/org/klomp/snark/SnarkManager.java:272
+#: ../java/src/org/klomp/snark/SnarkManager.java:275
#, java-format
msgid "Up BW limit changed to {0}KBps"
msgstr "Ðовое значение лимита ÑкороÑти отдачи: {0} KBps"
-#: ../java/src/org/klomp/snark/SnarkManager.java:274
+#: ../java/src/org/klomp/snark/SnarkManager.java:277
#, java-format
msgid "Minimum up bandwidth limit is {0}KBps"
msgstr "Минимально допуÑтимое значение Ð´Ð»Ñ Ð»Ð¸Ð¼Ð¸Ñ‚Ð° ÑкороÑти отдачи: {0} KBps"
-#: ../java/src/org/klomp/snark/SnarkManager.java:286
+#: ../java/src/org/klomp/snark/SnarkManager.java:289
#, java-format
msgid "Startup delay limit changed to {0} minutes"
msgstr "Ðовое значение задержки запуÑка: {0} минут(Ñ‹)"
-#: ../java/src/org/klomp/snark/SnarkManager.java:333
+#: ../java/src/org/klomp/snark/SnarkManager.java:336
msgid "I2CP and tunnel changes will take effect after stopping all torrents"
msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ð°Ñтроек I2CP и туннелей вÑтупÑÑ‚ в Ñилу поÑле оÑтановки вÑех торрентов."
-#: ../java/src/org/klomp/snark/SnarkManager.java:339
+#: ../java/src/org/klomp/snark/SnarkManager.java:343
msgid "Disconnecting old I2CP destination"
msgstr "РаÑÑоединÑемÑÑ Ð¿Ð¾ Ñтарому адреÑу I2CP"
-#: ../java/src/org/klomp/snark/SnarkManager.java:343
+#: ../java/src/org/klomp/snark/SnarkManager.java:347
#, java-format
msgid "I2CP settings changed to {0}"
msgstr "Ðовые параметры I2CP: {0}"
-#: ../java/src/org/klomp/snark/SnarkManager.java:347
+#: ../java/src/org/klomp/snark/SnarkManager.java:351
msgid "Unable to connect with the new settings, reverting to the old I2CP settings"
msgstr "Ðе удалоÑÑŒ ÑоединитьÑÑ Ñ Ð¸Ñпользованием новых наÑтроек I2CP, возвращаемÑÑ Ðº Ñтарым наÑтройкам"
-#: ../java/src/org/klomp/snark/SnarkManager.java:351
+#: ../java/src/org/klomp/snark/SnarkManager.java:355
msgid "Unable to reconnect with the old settings!"
msgstr "Ðе удалоÑÑŒ переÑоединитьÑÑ Ñ Ð¸Ñпользованием Ñтарых наÑтроек I2CP!"
-#: ../java/src/org/klomp/snark/SnarkManager.java:353
+#: ../java/src/org/klomp/snark/SnarkManager.java:357
msgid "Reconnected on the new I2CP destination"
msgstr "ПереÑоединилиÑÑŒ по новому адреÑу I2CP"
-#: ../java/src/org/klomp/snark/SnarkManager.java:364
+#: ../java/src/org/klomp/snark/SnarkManager.java:368
#, java-format
msgid "I2CP listener restarted for \"{0}\""
msgstr "I2CP-приёмник перезапущен Ð´Ð»Ñ \"{0}\""
-#: ../java/src/org/klomp/snark/SnarkManager.java:375
+#: ../java/src/org/klomp/snark/SnarkManager.java:379
msgid "Enabled autostart"
msgstr "ÐвтоÑтарт включен"
-#: ../java/src/org/klomp/snark/SnarkManager.java:377
+#: ../java/src/org/klomp/snark/SnarkManager.java:381
msgid "Disabled autostart"
msgstr "ÐвтоÑтарт выключен"
-#: ../java/src/org/klomp/snark/SnarkManager.java:383
+#: ../java/src/org/klomp/snark/SnarkManager.java:387
msgid "Enabled open trackers - torrent restart required to take effect."
msgstr "Включено иÑпользование открытых трекеров. ТребуетÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑк торрента, чтобы Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²Ñтупили в Ñилу."
-#: ../java/src/org/klomp/snark/SnarkManager.java:385
+#: ../java/src/org/klomp/snark/SnarkManager.java:389
msgid "Disabled open trackers - torrent restart required to take effect."
msgstr "Отключено иÑпользование открытых трекеров. ТребуетÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑк торрента, чтобы Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²Ñтупили в Ñилу."
-#: ../java/src/org/klomp/snark/SnarkManager.java:392
+#: ../java/src/org/klomp/snark/SnarkManager.java:396
msgid "Open Tracker list changed - torrent restart required to take effect."
msgstr "Изменен ÑпиÑок открытых трекеров. ТребуетÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑк торрента, чтобы Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²Ñтупили в Ñилу."
-#: ../java/src/org/klomp/snark/SnarkManager.java:399
+#: ../java/src/org/klomp/snark/SnarkManager.java:403
msgid "Configuration unchanged."
msgstr "ÐаÑтройки не изменилиÑÑŒ."
-#: ../java/src/org/klomp/snark/SnarkManager.java:409
+#: ../java/src/org/klomp/snark/SnarkManager.java:413
#, java-format
msgid "Unable to save the config to {0}"
msgstr "Ðе удалоÑÑŒ Ñохранить наÑтройки в {0}"
-#: ../java/src/org/klomp/snark/SnarkManager.java:445
+#: ../java/src/org/klomp/snark/SnarkManager.java:452
msgid "Connecting to I2P"
msgstr "УÑтанавливаетÑÑ Ñоединение Ñ I2P"
-#: ../java/src/org/klomp/snark/SnarkManager.java:448
+#: ../java/src/org/klomp/snark/SnarkManager.java:455
msgid "Error connecting to I2P - check your I2CP settings!"
msgstr "Ошибка ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ I2P, проверьте наÑтройки I2CP!"
-#: ../java/src/org/klomp/snark/SnarkManager.java:457
+#: ../java/src/org/klomp/snark/SnarkManager.java:464
#, java-format
msgid "Error: Could not add the torrent {0}"
msgstr "Ошибка: Ðе удалоÑÑŒ добавить торрент {0}"
#. catch this here so we don't try do delete it below
-#: ../java/src/org/klomp/snark/SnarkManager.java:479
+#: ../java/src/org/klomp/snark/SnarkManager.java:486
#, java-format
msgid "Cannot open \"{0}\""
msgstr "Ðе удалоÑÑŒ открыть \"{0}\""
-#: ../java/src/org/klomp/snark/SnarkManager.java:492
+#: ../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 "Внимание: указанные в \"{0}\" не-i2p трекеры будут проигнорированы, будут иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ открытые i2p трекеры"
-#: ../java/src/org/klomp/snark/SnarkManager.java:494
+#: ../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 "Внимание: указанные в \"{0}\" не-i2p трекеры будут проигнорированы, однако иÑпользование открытых i2p трекеров отключено, Ð’Ñ‹ должны включить поддержку открытых i2p трекеров перед запуÑком Ñтого торрента!"
-#: ../java/src/org/klomp/snark/SnarkManager.java:513
+#: ../java/src/org/klomp/snark/SnarkManager.java:521
#, java-format
msgid "Torrent in \"{0}\" is invalid"
msgstr "Торрент в \"{0}\" некорректен"
-#: ../java/src/org/klomp/snark/SnarkManager.java:528
+#: ../java/src/org/klomp/snark/SnarkManager.java:536
#, java-format
msgid "Torrent added and started: \"{0}\""
msgstr "Торрент добавлен и запущен: \"{0}\""
-#: ../java/src/org/klomp/snark/SnarkManager.java:530
+#: ../java/src/org/klomp/snark/SnarkManager.java:538
#, java-format
msgid "Torrent added: \"{0}\""
msgstr "Торрент добавлен: \"{0}\""
-#: ../java/src/org/klomp/snark/SnarkManager.java:627
+#: ../java/src/org/klomp/snark/SnarkManager.java:692
#, java-format
msgid "Too many files in \"{0}\" ({1}), deleting it!"
msgstr "Слишком много файлов в торренте \"{0}\" ({1}), удалÑем его!"
-#: ../java/src/org/klomp/snark/SnarkManager.java:629
+#: ../java/src/org/klomp/snark/SnarkManager.java:694
#, java-format
msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
msgstr "Торрент \"{0}\" Ñодержит единÑтвенный файл заканчивающийÑÑ Ð½Ð° \".torrent\", удалÑем его!"
-#: ../java/src/org/klomp/snark/SnarkManager.java:631
+#: ../java/src/org/klomp/snark/SnarkManager.java:696
#, java-format
msgid "No pieces in \"{0}\", deleting it!"
msgstr "Ð’ торренте \"{0}\" не оказалоÑÑŒ ни одной чаÑти, удалÑем его!"
-#: ../java/src/org/klomp/snark/SnarkManager.java:633
+#: ../java/src/org/klomp/snark/SnarkManager.java:698
#, java-format
msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
msgstr "Слишком много чаÑтей в торренте \"{0}\" (наш предел {1}), удалÑем его!"
-#: ../java/src/org/klomp/snark/SnarkManager.java:635
+#: ../java/src/org/klomp/snark/SnarkManager.java:700
#, java-format
msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
msgstr "Слишком крупные чаÑти в торренте \"{0}\" ({1}B), удалÑем его."
-#: ../java/src/org/klomp/snark/SnarkManager.java:636
+#: ../java/src/org/klomp/snark/SnarkManager.java:701
#, java-format
msgid "Limit is {0}B"
msgstr "Ðаш предел {0}B"
-#: ../java/src/org/klomp/snark/SnarkManager.java:644
+#: ../java/src/org/klomp/snark/SnarkManager.java:709
#, java-format
msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
msgstr "Торренты крупнее чем {0}B пока не поддерживаетÑÑ, удалÑем \"{1}\""
-#: ../java/src/org/klomp/snark/SnarkManager.java:660
+#: ../java/src/org/klomp/snark/SnarkManager.java:725
#, java-format
msgid "Error: Could not remove the torrent {0}"
msgstr "Ошибка: Ðевозможно удалить торрент {0}"
-#: ../java/src/org/klomp/snark/SnarkManager.java:681
+#: ../java/src/org/klomp/snark/SnarkManager.java:746
#, java-format
msgid "Torrent stopped: \"{0}\""
msgstr "Торрент оÑтановлен: \"{0}\""
-#: ../java/src/org/klomp/snark/SnarkManager.java:696
+#: ../java/src/org/klomp/snark/SnarkManager.java:761
#, java-format
msgid "Torrent removed: \"{0}\""
msgstr "Торрент удален: \"{0}\""
-#: ../java/src/org/klomp/snark/SnarkManager.java:729
+#: ../java/src/org/klomp/snark/SnarkManager.java:799
#, java-format
-msgid "Download finished: \"{0}\""
-msgstr "Завершена загрузка: \"{0}\""
+msgid "Download finished: {0}"
+msgstr "Закачка завершена: {0}"
-#: ../java/src/org/klomp/snark/SnarkManager.java:729
+#: ../java/src/org/klomp/snark/SnarkManager.java:799
#, java-format
msgid "size: {0}B"
msgstr "размер: {0}B"
-#: ../java/src/org/klomp/snark/SnarkManager.java:757
+#: ../java/src/org/klomp/snark/SnarkManager.java:827
msgid "Unable to connect to I2P!"
msgstr "Ðе удалоÑÑŒ уÑтановить Ñоединение Ñ I2P!"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:168
+#: ../java/src/org/klomp/snark/SnarkManager.java:833
+#, java-format
+msgid "Unable to add {0}"
+msgstr "Ðе удаётÑÑ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:176
msgid "I2PSnark - Anonymous BitTorrent Client"
msgstr "I2PSnark — Ðнонимный BitTorrent Клиент"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:179
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:187
msgid "Torrents"
msgstr "Торренты"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:181
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:187
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:831
+#: ../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:185
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:194
msgid "Refresh page"
msgstr "Обновить Ñтраницу"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:189
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:199
msgid "Forum"
msgstr "Форум"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:234
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1283
+#: ../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 "СтатуÑ"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:240
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:255
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:257
msgid "Hide Peers"
msgstr "ÑпрÑтать ÑпиÑок пиров"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:243
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:262
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:264
msgid "Show Peers"
msgstr "показать ÑпиÑок пиров"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:248
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1265
+#: ../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 "Торрент"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:250
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:276
+msgid "Estimated Download Time"
+msgstr "Предположительное Ð’Ñ€ÐµÐ¼Ñ Ð—Ð°ÐºÐ°Ñ‡ÐºÐ¸"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:278
msgid "ETA"
msgstr "ОÑталоÑÑŒ"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:252
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:281
msgid "Downloaded"
msgstr "Получено"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:254
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:283
+msgid "RX"
+msgstr "ПринÑто"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:286
msgid "Uploaded"
msgstr "Отдано"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:256
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:288
+msgid "TX"
+msgstr "Отдано"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:291
msgid "Down Rate"
msgstr "СкороÑÑ‚ÑŒ загрузки"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:258
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:293
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:298
+msgid "Rate"
+msgstr "СкороÑÑ‚ÑŒ"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:296
msgid "Up Rate"
msgstr "СкороÑÑ‚ÑŒ отдачи"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:265
+#: ../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 "ОÑтановить вÑе торренты и закрыть Ñоединение Ñ I2P"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:267
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:309
msgid "Stop All"
msgstr "ОÑтановить вÑе"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:272
+#: ../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 "ЗапуÑтить вÑе торренты и открыть Ñоединение Ñ I2P"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:274
-msgid "Start All"
-msgstr "ЗапуÑтить вÑе"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:291
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:336
msgid "No torrents loaded."
msgstr "Ðет загруженных торрентов."
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:296
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:341
msgid "Totals"
msgstr "Ð’Ñего"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:298
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:343
#, java-format
msgid "1 torrent"
msgid_plural "{0} torrents"
@@ -307,7 +332,7 @@ msgstr[0] "{0} торрент"
msgstr[1] "{0} торрента"
msgstr[2] "{0} торрентов"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:301
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:346
#, java-format
msgid "1 connected peer"
msgid_plural "{0} connected peers"
@@ -315,135 +340,136 @@ msgstr[0] "{0} подÑоединенный пир"
msgstr[1] "{0} подÑоединенных пиров"
msgstr[2] "{0} подÑоединенных пиров"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:330
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:375
#, java-format
msgid "Torrent file {0} does not exist"
msgstr "Торрент {0} не ÑущеÑтвует"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:340
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1470
+#: ../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 "Торрент уже запущен: {0}"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:342
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1472
+#: ../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 "Торрент уже в очереди: {0}"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:346
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:391
#, java-format
msgid "Copying torrent to {0}"
msgstr "Копируем торрент в: {0}"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:349
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:394
#, java-format
msgid "Unable to copy the torrent to {0}"
msgstr "Ðе удалоÑÑŒ Ñкопировать торрент в: {0}"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:349
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:394
#, java-format
msgid "from {0}"
msgstr "из: {0}"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:357
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:402
#, java-format
msgid "Fetching {0}"
msgstr "Получение торрента: {0}"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:361
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:406
msgid "Invalid URL - must start with http://"
msgstr "Ðекорректный URL, должен начинатьÑÑ Ñ http://"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:391
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:436
#, java-format
msgid "Starting up torrent {0}"
msgstr "ЗапуÑкаем торрент: {0}"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:411
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:429
+#: ../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 "Удален торрент: {0}"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:435
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:445
+#: ../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 "Файл удален: {0}"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:437
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:447
+#: ../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 "Ðе удалоÑÑŒ удалить файл: {0}"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:456
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:501
#, java-format
msgid "Data dir deleted: {0}"
msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð°: {0}"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:488
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:533
msgid "Error creating torrent - you must select a tracker"
msgstr "Торрент не Ñоздан — вы должны указать трекер"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:503
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:548
#, java-format
msgid "Torrent created for \"{0}\""
msgstr "Создан торрент Ð´Ð»Ñ \"{0}\""
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:506
+#: ../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 "Многие I2P трекеры требуют зарегиÑтрировать на них торрент перед началом раздачи — пожалуйÑта проверьте требуетÑÑ Ð»Ð¸ Ñто перед запуÑком \"{0}\""
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:553
#, java-format
msgid "Error creating a torrent for \"{0}\""
msgstr "Ошибка при Ñоздании торрента длÑ: \"{0}\""
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:556
#, java-format
msgid "Cannot create a torrent for the nonexistent data: {0}"
msgstr "Ðевозможно Ñоздать торрент Ð´Ð»Ñ Ð½ÐµÑущеÑтвующего файла или директории: {0}"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:514
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:559
msgid "Error creating torrent - you must enter a file or directory"
msgstr "Торрент не Ñоздан — вы должны указать файл или директорию"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:517
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:562
msgid "Stopping all torrents and closing the I2P tunnel."
msgstr "ОÑтанавливаем вÑе торренты и закрываем Ñоединение Ñ I2P"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:526
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:573
msgid "I2P tunnel closed."
msgstr "Соединение Ñ I2P закрыто."
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:529
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:576
msgid "Opening the I2P tunnel and starting all torrents."
msgstr "СоединÑемÑÑ Ñ I2P и запуÑкаем вÑе торренты."
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:651
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:845
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:915
msgid "Unknown"
msgstr "ÐеизвеÑтный"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:654
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:659
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:664
-msgid "TrackerErr"
-msgstr "ОшибкаТрекера"
+#: ../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 "Ошибка Трекера"
# TODO should replace "uploader limit NN peers" with "global number of upload slots: NN"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:657
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:660
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:671
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:674
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:682
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:685
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:690
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:693
+#: ../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"
@@ -451,261 +477,261 @@ msgstr[0] "{0} пир"
msgstr[1] "{0} пира"
msgstr[2] "{0} пиров"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:668
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:717
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:722
msgid "Seeding"
msgstr "РаздаетÑÑ"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:676
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1321
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:726
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1427
msgid "Complete"
msgstr "Завершен"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:679
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:684
-msgid "OK"
-msgstr "ЗагружаетÑÑ"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:729
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:734
+msgid "Downloading"
+msgstr "Идёт загрузка"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:692
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:738
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:743
msgid "Stalled"
msgstr "ПроÑтаивает"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:695
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:747
msgid "No Peers"
msgstr "Ðет Пиров"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:697
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:751
msgid "Stopped"
msgstr "ОÑтановлен"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:712
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:766
msgid "View files"
msgstr "Открыть директорию"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:714
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:768
msgid "Open file"
msgstr "Открыть файл"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:744
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:961
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:798
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049
msgid "Tracker"
msgstr "Трекер"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:745
-msgid "Details"
-msgstr "Подробнее"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:779
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:836
msgid "Stop the torrent"
msgstr "ОÑтановить торрент"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:781
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:838
msgid "Stop"
msgstr "ОÑтановить"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:787
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:845
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:848
msgid "Start the torrent"
msgstr "ЗапуÑтить торрент"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:789
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:850
msgid "Start"
msgstr "ЗапуÑтить"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:794
+#: ../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 "Удалить торрент из ÑпиÑка и Ñ Ð´Ð¸Ñка"
#. 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:799
+#: ../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 "Ð’Ñ‹ дейÑтвительно хотите удалить \\''{0}.torrent\\''? (загруженные файлы удалÑÑ‚ÑŒÑÑ ÐЕ будут)"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:801
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866
msgid "Remove"
msgstr "Удалить"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:805
+#: ../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 "Удалить торрент и Ñтереть загруженные файлы"
#. 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:810
+#: ../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 "Ð’Ñ‹ дейÑтвительно хотите удалить торрент \\''{0}\\'' и вÑе загруженные файлы?"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:812
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:881
msgid "Delete"
msgstr "Стереть"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:855
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:925
msgid "Seed"
msgstr "Сид"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:873
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:943
msgid "Uninteresting (The peer has no pieces we need)"
msgstr "Uninteresting (У пира нет нужных нам чаÑтей торрента)"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:875
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:945
msgid "Choked (The peer is not allowing us to request pieces)"
msgstr "Choked (Ðтот пир не позволÑет нам запрашивать чаÑти торрента)"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:889
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:959
msgid "Uninterested (We have no pieces the peer needs)"
msgstr "Uninterested (У Ð½Ð°Ñ Ð½ÑƒÐ¶Ð½Ñ‹Ñ… Ñтому пиру чаÑтей торрента)"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:891
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:961
msgid "Choking (We are not allowing the peer to request pieces)"
msgstr "Choking (Мы не позволÑем Ñтому пиру запрашивать у Ð½Ð°Ñ Ñ‡Ð°Ñти торрента)"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:921
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1005
msgid "Add Torrent"
msgstr "Добавить Торрент"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:923
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1007
msgid "From URL"
msgstr "Из URL"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:928
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1010
+msgid "Torrent file must originate from an I2P-based tracker"
+msgstr "Торрент-файл должен быть Ñ I2P-трекера"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1015
msgid "Add torrent"
msgstr "Добавить торрент"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:931
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1018
#, java-format
-msgid "Alternately, you can copy .torrent files to the directory {0}."
-msgstr "Ðу или вы можете Ñкопировать .torrent-файлы в директорию {0}."
+msgid "You can also copy .torrent files to: {0}."
+msgstr "Либо вы можете проÑто Ñкопировать .torrent-файлы в директорию {0}."
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:933
-msgid "Removing a .torrent file will cause the torrent to stop."
-msgstr "Удаление .torrent-файла приведет к оÑтановке торрента."
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1020
+msgid "Removing a .torrent will cause it to stop."
+msgstr "Удаление .torrent-файла приведёт к оÑтановке торрента."
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:952
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1040
msgid "Create Torrent"
msgstr "Создать Торрент"
#. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\" value=\"" + newFile + "\" /><br>\n");
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:955
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043
msgid "Data to seed"
msgstr "Файлы Ð´Ð»Ñ Ñ€Ð°Ð·Ð´Ð°Ñ‡Ð¸"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:959
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1047
msgid "File or directory to seed (must be within the specified path)"
msgstr "Файл или Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð´Ð»Ñ Ñ€Ð°Ð·Ð´Ð°Ñ‡Ð¸ (вводите только название файла или директории, указание абÑолютных путей не поддерживаетÑÑ)"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:963
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1051
msgid "Select a tracker"
msgstr "Выбрать трекер"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:976
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1064
msgid "or"
msgstr "или"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:979
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1067
msgid "Specify custom tracker announce URL"
msgstr "Задать URL анонÑера вручную"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:982
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1070
msgid "Create torrent"
msgstr "Создать торрент"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1000
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1127
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1089
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1213
msgid "Configuration"
msgstr "ÐаÑтройки"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1003
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1092
msgid "Data directory"
msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1006
-msgid "Directory to store torrents and data"
-msgstr "ДиректориÑ, где будут хранитьÑÑ Ñ‚Ð¾Ñ€Ñ€ÐµÐ½Ñ‚Ñ‹ и загружаемые файлы"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1008
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
msgid "Edit i2psnark.config and restart to change"
msgstr "Ð”Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€ÑƒÐ¹Ñ‚Ðµ файл i2psnark.config и перезагрузите I2PSnark"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1012
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1098
msgid "Auto start"
msgstr "ÐвтозапуÑк"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1016
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1102
msgid "If checked, automatically start torrents that are added"
msgstr "ÐвтоматичеÑки запуÑкать торренты поÑле добавлениÑ"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1020
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1106
msgid "Startup delay"
msgstr "Задержка запуÑка"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1108
msgid "minutes"
msgstr "минут"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1046
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1132
msgid "Total uploader limit"
msgstr "Ограничение количеÑтва Ñлотов отдачи"
# TODO should replace "uploader limit NN peers" with "global number of upload slots: NN"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1135
msgid "peers"
msgstr "пир."
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1053
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1139
msgid "Up bandwidth limit"
msgstr "Ограничение ÑкороÑти отдачи"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1056
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142
msgid "Half available bandwidth recommended."
msgstr "РекомендуетÑÑ Ð¸Ñпользовать половину от доÑтупной пропуÑкной ÑпоÑобноÑти."
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1058
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1144
msgid "View or change router bandwidth"
msgstr "ПоÑмотреть/наÑтроить Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ ÑкороÑти в маршрутизаторе I2P"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1062
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1148
msgid "Use open trackers also"
msgstr "Дополнительно иÑпользовать открытые трекеры"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1066
+#: ../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 "ÐнонÑировать торренты на открытых трекерах, дополнительно к тем, что указаны внутри торрента"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1070
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1156
msgid "Open tracker announce URLs"
msgstr "URL открытых трекеров"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1082
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168
msgid "Inbound Settings"
msgstr "ВходÑщие туннели"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1088
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1174
msgid "Outbound Settings"
msgstr "ИÑходÑщие туннели"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1095
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1181
msgid "I2CP host"
msgstr "ÐÐ´Ñ€ÐµÑ I2CP"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1100
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1186
msgid "I2CP port"
msgstr "Порт I2CP"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1112
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1198
msgid "I2CP options"
msgstr "Параметры I2CP"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1118
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1203
msgid "Save configuration"
msgstr "Сохранить наÑтройки"
#. * dummies for translation
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1135
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1221
#, java-format
msgid "1 hop"
msgid_plural "{0} hops"
@@ -713,7 +739,7 @@ msgstr[0] "{0} хоп"
msgstr[1] "{0} хопа"
msgstr[2] "{0} хопов"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1136
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1222
#, java-format
msgid "1 tunnel"
msgid_plural "{0} tunnels"
@@ -721,52 +747,91 @@ msgstr[0] "{0} туннель"
msgstr[1] "{0} туннелÑ"
msgstr[2] "{0} туннелей"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1277
-msgid "Up to higher level directory"
-msgstr "Перейти в директорию уровнем выше"
-
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1282
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1371
msgid "File"
msgstr "Файл"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1282
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1374
+msgid "FileSize"
+msgstr "Размер Файла"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1374
msgid "Size"
msgstr "Размер"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1305
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1377
+msgid "Download Status"
+msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð·Ð°ÐºÐ°Ñ‡ÐºÐ¸"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1381
+msgid "Priority"
+msgstr "Приоритет"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1386
+msgid "Up to higher level directory"
+msgstr "Перейти в директорию уровнем выше"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1411
msgid "Directory"
msgstr "ДиректориÑ"
# This debug error message intentionally left in English
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1310
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1416
msgid "Torrent not found?"
msgstr "Torrent not found?"
# This debug error message intentionally left in English
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1318
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1424
msgid "File not found in torrent?"
msgstr "File not found in torrent?"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1324
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1431
msgid "complete"
msgstr "Ñкачано"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1325
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1432
msgid "bytes remaining"
msgstr "байт оÑталоÑÑŒ"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1450
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1483
+msgid "High"
+msgstr "Ð’Ñ‹Ñокий"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1488
+msgid "Normal"
+msgstr "Ðормальный"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1493
+msgid "Ignore"
+msgstr "Ðе качать"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502
+msgid "Save priorities"
+msgstr "Сохранить приоритеты"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1609
#, java-format
msgid "Torrent fetched from {0}"
msgstr "Получен торрент из: {0}"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1478
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1637
#, java-format
msgid "Torrent at {0} was not valid"
msgstr "Торрент полученный из {0} некорректен"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1483
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1642
#, java-format
msgid "Torrent was not retrieved from {0}"
msgstr "Ðе удалоÑÑŒ получить торрент из: {0}"
+#~ msgid "Start All"
+#~ msgstr "ЗапуÑтить вÑе"
+
+#~ msgid "OK"
+#~ msgstr "ЗагружаетÑÑ"
+
+#~ msgid "Details"
+#~ msgstr "Подробнее"
+
+#~ msgid "Directory to store torrents and data"
+#~ msgstr "ДиректориÑ, где будут хранитьÑÑ Ñ‚Ð¾Ñ€Ñ€ÐµÐ½Ñ‚Ñ‹ и загружаемые файлы"
diff --git a/apps/i2ptunnel/locale/messages_de.po b/apps/i2ptunnel/locale/messages_de.po
index 4a58c0c7b57c14e5561d5b5a549e4c486c1b477c..713d1ef6aa2ec5d51d88b845d0b80e2c020de147 100644
--- 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:227
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:244
-msgid "interactive connection"
-msgstr "Interaktive Verbindung"
-
-#: ../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:217
+msgid "b32 not recommended"
+msgstr "B32-Adressen nicht empfohlen"
-#: ../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
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:223
msgid "Shared Client"
-msgstr "Geteilter Klient"
+msgstr "versch. Klienten"
-#: ../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 "(Teile Tunnel mit anderen Klienten und IRC/HTTP Klienten? Änderungen benötigen Neustart des Klientenproxys)"
+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: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 "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: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 Hop Varianz (standard zufällige Verteilung, 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: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 Hop Varianz (nicht empfohlen)"
+msgstr "+/- 0-2 Hops Varianz (nicht empfohlen)"
-#: ../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 "Hop Varianz"
+msgstr "Hops 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
+#: ../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 "Zähler"
+msgstr "Anzahl"
-#: ../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 eingehender, 1 ausgehender Tunnel (geringe Bandbreitennutzung, wenig Zuverlässigkeit)"
+msgstr "1 eingehender, 1 ausgehender Tunnel (geringe Bandbreitennutzung, weniger zuverlässig)"
-#: ../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 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: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 Backup Tunnel in jede Richtung (hohe Redundanz, hohe Ressourcennutzung)"
+msgstr "3 Ersatztunnel in jede Richtung (hohe Redundanz, hohe Ressourcennutzung)"
-#: ../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 "Backup Tunnel"
+msgstr "Ersatztunnel"
-#: ../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 "Profil"
+
+#: ../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: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"
-
-#: ../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
+msgstr "Anzahl an Tunneln im Leerlauf reduzieren"
+
+#: ../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:252
+msgid "Hostname Signature"
+msgstr "Signatur des Namens"
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:415
+#: ../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"
diff --git a/apps/i2ptunnel/locale/messages_ru.po b/apps/i2ptunnel/locale/messages_ru.po
index 9e8582a0e2ceed06bb8b75e70743c6fff4404979..aa52967726e52d242f3a734fdccfebc40527666a 100644
--- 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: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:217
+msgid "b32 not recommended"
+msgstr "b32 не рекомендуетÑÑ"
-#: ../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 "не реализовано"
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
index 97f1a5254c7ecd8386ddb952637852b6fcd8b7df..fbb9bad4fff763811df80235625798a5322fb3e1 100644
--- 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 */
diff --git a/apps/routerconsole/jsp/help.jsp b/apps/routerconsole/jsp/help.jsp
index 86acd6dace9e2676534d7d84c5ce8176367253b1..6a23198dba82b3a0b134a4b408cb5000ef84bbef 100644
--- 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>
diff --git a/apps/routerconsole/jsp/help_nl.jsp b/apps/routerconsole/jsp/help_nl.jsp
index b486a4c6626719830db5acab0ea53658406aff71..5fbf54dca09b63dfb32a15038cf16e54634f81ae 100644
--- a/apps/routerconsole/jsp/help_nl.jsp
+++ b/apps/routerconsole/jsp/help_nl.jsp
@@ -54,12 +54,12 @@ varië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ïntegreerd:</b>
diff --git a/apps/routerconsole/jsp/help_ru.jsp b/apps/routerconsole/jsp/help_ru.jsp
index 560759236c2217f39729ef0795916b7428b87162..03b1fdde833cd3a09e4f5378b27c37bac8f2708d 100644
--- 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>
diff --git a/apps/routerconsole/locale/messages_de.po b/apps/routerconsole/locale/messages_de.po
index f58bb8e0e288a31a32a38dc8608ed65dbd162b17..ccd3e47ae340213290a76c9766c41e915c0d2fca 100644
--- a/apps/routerconsole/locale/messages_de.po
+++ b/apps/routerconsole/locale/messages_de.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: I2P routerconsole\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-08 08:03+0000\n"
-"PO-Revision-Date: 2010-07-26 14:04+0100\n"
-"Last-Translator: echelon <echelon@i2pmail.org>\n"
+"POT-Creation-Date: 2010-11-10 08:24+0000\n"
+"PO-Revision-Date: 2010-11-16 18:34+0100\n"
+"Last-Translator: mixxy <m1xxy@mail.i2p>\n"
"Language-Team: echelon <echelon@mail.i2p>, Sperreingang <sperrbezirk@mail.i2p>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -35,11 +35,11 @@ msgstr "IP gesperrt"
#: ../../../router/java/src/net/i2p/router/Blocklist.java:743
#, java-format
msgid "IP banned by blocklist.txt entry {0}"
-msgstr "IP gesperrt wegen blocklist.txt Eintrag {0}"
+msgstr "IP gesperrt wegen blocklist.txt-Eintrags {0}"
#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:92
msgid "Rejecting tunnels: Shutting down"
-msgstr "Weise Tunnelanfragen zurück: beende Router"
+msgstr "Weise Tunnelanfragen zurück: Beende Router"
#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:141
msgid "Rejecting tunnels: High message delay"
@@ -86,75 +86,75 @@ msgstr "Akzeptiere Tunnelanfragen"
msgid "Rejecting tunnels"
msgstr "Weise Tunnelanfragen zurück"
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:48
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:50
msgid "Ensure that nothing blocks outbound HTTP, check <a target=\"_top\" href=\"logs.jsp\">logs</a> and if nothing helps, read the <a target=\"_top\" href=\"http://www.i2p2.de/faq.html\">FAQ</a> about reseeding manually."
-msgstr "Stellen Sie bitte sicher, das nichts den HTTP Transfer blockiert, kontrollieren Sie die <a target=\"_top\" href=\"logs.jsp\">Berichte</a> und wenn gar nichts hilft, lesen Sie die <a target=\"_top\" href=\"http://www.i2p2.de/faq.html\">FAQ</a> über das manuelle Reseeden."
+msgstr "Stellen Sie bitte sicher, dass nichts ausgehenden HTTP-Transfer blockiert, überprüfen Sie die <a target=\"_top\" href=\"logs.jsp\">Berichte</a>, und wenn gar nichts hilft, lesen Sie die <a target=\"_top\" href=\"http://www.i2p2.de/faq.html\">FAQ</a> über das manuelle Reseeden."
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:80
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:82
msgid "Reseeding"
msgstr "Reseeden"
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:144
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:146
msgid "Reseeding: fetching seed URL."
-msgstr "Reseed: Hole die Seed URL."
+msgstr "Reseed: Hole die Seed-URL"
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:150
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:152
msgid "Last reseed failed fully (failed reading seed URL)."
-msgstr "Letztes Reseed komplett gescheitert (konnte die Seed URL nicht lesen)."
+msgstr "Letztes Reseed komplett gescheitert (konnte die Seed-URL nicht lesen)."
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:176
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:178
msgid "Last reseed failed fully (no routerInfo URLs at seed URL)."
-msgstr "Letztes Reseed komplett gescheitert (keine RouterInfo URLs bei der Seed URL)."
+msgstr "Letztes Reseed komplett gescheitert (keine RouterInfo-URLs unter der Seed-URL)."
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:191
#, java-format
msgid "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
-msgstr "Reseed: holen von Router Informationen von Seed URL {0} erfolgreich, {1} Fehler)."
+msgstr "Reseed: Holen der Router-Informationen von Seed-URL ({0} erfolgreich, {1} Fehler)."
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212
#, java-format
msgid "Last reseed failed partly ({0}% of {1})."
msgstr "Letzes Reseed teilweise gescheitert ({0}% von {1})."
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:215
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:217
#, java-format
msgid "Last reseed failed ({0}% of {1})."
msgstr "Letzes Reseed gescheitert ({0}% von {1})."
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:225
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:227
msgid "Last reseed failed fully (exception caught)."
msgstr "Letzes Reseed gescheitert (Fehler aufgetreten)."
#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:510
msgid "NetDb entry"
-msgstr "NetzDB Eintrag"
+msgstr "NetzDB-Eintrag"
#. This used to be "no common transports" but it is almost always no transports at all
#: ../../../router/java/src/net/i2p/router/transport/GetBidsJob.java:70
msgid "No transports (hidden or starting up?)"
msgstr "Keine Transporte (Versteckter Modus oder Start?)"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:457
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:451
msgid "Unreachable on any transport"
msgstr "Unerreichbar auf allen Transporten"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:508
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:500
msgid "Router Transport Addresses"
-msgstr "Router Transport Adresse"
+msgstr "Router-Transport-Adresse"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:514
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:505
#, java-format
msgid "{0} is used for outbound connections only"
msgstr "{0} wird nur für ausgehende Verbindungen genutzt"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:528
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:519
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:257
msgid "Definitions"
msgstr "Definitionen"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:529
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:520
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:715
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1885
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1888
#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:24
#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:33
#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:35
@@ -164,169 +164,169 @@ msgstr "Definitionen"
msgid "Peer"
msgstr "Teilnehmer"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:529
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:520
msgid "The remote peer, identified by router hash"
-msgstr "Der entfernte Teilnehmer, über Router Prüfsumme erkannt"
+msgstr "Der entfernte Teilnehmer, über seine Router-Prüfsumme erkannt"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:530
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:521
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:716
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1889
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1892
msgid "Dir"
msgstr "Richtung"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:531
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:522
msgid "Inbound connection"
msgstr "Eingehende Verbindungen"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:533
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:524
msgid "Outbound connection"
msgstr "Ausgehende Verbindungen"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:535
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:526
msgid "They offered to introduce us (help other peers traverse our firewall)"
-msgstr "Sie bieten an uns bekannt zu machen (anderen Teilnehmern helfen Ihre Firewall zu überwinden)"
+msgstr "Sie boten an, uns bekannt zu machen (anderen Teilnehmern helfen, unsere Firewall zu überwinden)"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:537
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:528
msgid "We offered to introduce them (help other peers traverse their firewall)"
-msgstr "Wir bieten an, Sie bekannt zu machen (anderen Teilnehmern zur Ãœberwindung ihrer Firewall helfen)"
+msgstr "Wir bieten an, sie bekannt zu machen (anderen Teilnehmern helfen, ihre Firewall zu überwinden)"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:538
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:529
msgid "How long since a packet has been received / sent"
msgstr "Vergangene Zeit seit ein Paket empfangen/gesendet wurde"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:538
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:529
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:717
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1890
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1893
msgid "Idle"
-msgstr "Idle"
+msgstr "Untätig"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:539
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:530
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:718
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1895
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1898
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:156
msgid "In/Out"
-msgstr "Ein/Ausgehend"
+msgstr "Ein-/Ausgehend"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:539
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:530
msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
-msgstr "Die geglättete aus/eingehende Transferrate (KBytes pro Sekunde)"
+msgstr "Die geglättete ein-/ausgehende Transferrate (KBytes pro Sekunde)"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:540
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:531
msgid "How long ago this connection was established"
-msgstr "Vor welcher Zeit wurde die Verbindung aufgebaut"
+msgstr "Wie lange die Verbindung schon besteht"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:540
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:531
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:719
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1900
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1903
msgid "Up"
-msgstr "Ausgehend"
+msgstr "Verbunden"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:541
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:532
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:720
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1902
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1905
msgid "Skew"
msgstr "Differenz"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:541
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:532
msgid "The difference between the peer's clock and your own"
msgstr "Der Unterschied zwischen Ihrer und der Uhr des Teilnehmers"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:542
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:533
msgid "The congestion window, which is how many bytes can be sent without an acknowledgement"
-msgstr "Der Pufferspeicher, der angibt, wieviele Bytes Sie ohne Rückmeldung senden können"
+msgstr "Der Pufferspeicher, der angibt, wieviele Bytes Sie ohne Bestätigung senden können"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:543
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:534
msgid "The number of sent messages awaiting acknowledgement"
msgstr "Die Anzahl der gesendeten Nachrichten, die auf Bestätigung warten"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:544
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:535
msgid "The maximum number of concurrent messages to send"
-msgstr "Die maximale Anzahl von gleichzeitig gesendeten Nachrichten"
+msgstr "Die maximale Anzahl von gleichzeitig sendbaren Nachrichten"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:545
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:536
msgid "The number of pending sends which exceed congestion window"
-msgstr "Die Anzahl der ausstehenden Sendeanforderungen die den Pufferspeicher überschreiten."
+msgstr "Die Anzahl der ausstehenden Sendeanforderungen, die den Pufferspeicher überschreiten."
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:546
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:537
msgid "The slow start threshold"
msgstr "Der Grenzwert zum verzögertem Starten"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:547
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:538
msgid "The round trip time in milliseconds"
msgstr "Die Rundenzeit zum Server und zurück in Millisekunden"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:548
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1912
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:539
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1915
msgid "Dev"
msgstr "Abweichung"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:548
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:539
msgid "The standard deviation of the round trip time in milliseconds"
-msgstr "Standardabweichung der Rundenzeit in Millisekunden"
+msgstr "Standardabweichung der Rundenzeit (in Millisekunden)"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:549
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:540
msgid "The retransmit timeout in milliseconds"
-msgstr "Der Timeout beim erneuten Senden in Millisekunden"
+msgstr "Der Timeout beim erneuten Senden (in Millisekunden)"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:550
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:541
msgid "Current maximum send packet size / estimated maximum receive packet size (bytes)"
-msgstr "Derzeitig maximale Größe der gesendeten Pakete / geschätzte maximale Größe der empfangenen Pakete (Byte)"
+msgstr "Derzeit maximale Größe der gesendeten Pakete / geschätzte maximale Größe der empfangenen Pakete (Bytes)"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:551
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:542
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:721
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1919
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1922
msgid "TX"
-msgstr "Sendend"
+msgstr "Gesendet"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:551
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:542
msgid "The total number of packets sent to the peer"
-msgstr "Die totale Anzahl an den Teilnehmer gesendeter Pakete"
+msgstr "Gesamtanzahl der an den Teilnehmer gesendeten Pakete"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:552
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:543
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:722
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1921
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1924
msgid "RX"
-msgstr "Empfangend"
+msgstr "Empfangen"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:552
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:543
msgid "The total number of packets received from the peer"
-msgstr "Die totale Anzahl vom Teilnehmer empfangener Pakete"
+msgstr "Gesamtanzahl der vom Teilnehmer empfangenen Pakete"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:553
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1924
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:544
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1927
msgid "Dup TX"
msgstr "Mehrfach gesendet"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:553
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:544
msgid "The total number of packets retransmitted to the peer"
-msgstr "Die totale Anzahl an den Teilnehmer erneut gesendeter Pakete"
+msgstr "Gesamtanzahl der an den Teilnehmer erneut gesendeten Pakete"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:554
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1926
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:545
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1929
msgid "Dup RX"
-msgstr "Mehrfach Empfangen"
+msgstr "Mehrfach empfangen"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:554
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:545
msgid "The total number of duplicate packets received from the peer"
-msgstr "Die totale Anzahl vom Teilnehmer erneut empfangener Pakete"
+msgstr "Gesamtanzahl der vom Teilnehmer erneut empfangenen Pakete"
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:380
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:594
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:409
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:627
#, java-format
msgid "Excessive clock skew: {0}"
-msgstr "Große Abweichung der Uhrzeit: {0}"
+msgstr "Zu hohe Abweichung der Uhrzeit: {0}"
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:710
msgid "NTCP connections"
-msgstr "NTCP Verbindungen"
+msgstr "NTCP-Verbindungen"
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:711
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1881
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1884
msgid "Limit"
-msgstr "Limit"
+msgstr "Obere Grenze"
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:712
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1882
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1885
msgid "Timeout"
msgstr "Timeout"
@@ -339,13 +339,13 @@ msgid "Backlogged?"
msgstr "Rückstau"
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:738
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1944
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1947
#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:82
msgid "Inbound"
msgstr "ankommend"
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:740
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1946
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1949
#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:82
msgid "Outbound"
msgstr "abgehend"
@@ -355,137 +355,137 @@ msgstr "abgehend"
msgid "peers"
msgstr "Teilnehmer"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1880
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1883
msgid "UDP connections"
-msgstr "UDP Verbindungen"
+msgstr "UDP-Verbindungen"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1887
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1890
msgid "Sort by peer hash"
msgstr "Nach Router Prüfsumme sortieren"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1889
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1892
msgid "Direction/Introduction"
-msgstr "Richtung/Einweisung"
+msgstr "Richtung/Bekanntmachung"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1891
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1894
msgid "Sort by idle inbound"
msgstr "Sortieren nach untätigen eingehenden Verbindungen"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1893
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1896
msgid "Sort by idle outbound"
msgstr "Sortieren nach untätigen ausgehenden Verbindungen"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1896
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1899
msgid "Sort by inbound rate"
msgstr "Sortieren nach eingehender Transferrate"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1898
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1901
msgid "Sort by outbound rate"
msgstr "Sortieren nach ausgehender Transferrate"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1901
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1904
msgid "Sort by connection uptime"
-msgstr "Sortieren nach Lebenszeit der Verbindung"
+msgstr "Sortieren nach Lebensdauer der Verbindung"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1903
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1906
msgid "Sort by clock skew"
msgstr "Sortieren nach Zeitunterschied"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1906
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1909
msgid "Sort by congestion window"
msgstr "Sortieren nach Größe des Pufferspeichers"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1908
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1911
msgid "Sort by slow start threshold"
msgstr "Sortieren nach Grenzwert des verzögerten Startens"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1911
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1914
msgid "Sort by round trip time"
msgstr "Sortieren nach Rundenzeit"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1913
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1916
msgid "Sort by round trip time deviation"
msgstr "Sortieren nach Abweichung der Rundenzeit"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1915
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1918
msgid "Sort by retransmission timeout"
msgstr "Sortieren nach Timeout beim erneuten Senden"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1918
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1921
msgid "Sort by outbound maximum transmit unit"
-msgstr "Sortieren nach maximaler ausgehender Transferpaket Größe"
+msgstr "Sortieren nach maximaler ausgehender Transferpaketgröße"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1920
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1923
msgid "Sort by packets sent"
msgstr "Sortieren nach Anzahl gesendeter Pakete"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1922
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1925
msgid "Sort by packets received"
msgstr "Sortieren nach Anzahl empfangener Pakete"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1925
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1928
msgid "Sort by packets retransmitted"
msgstr "Sortieren nach Anzahl erneut gesendeter Pakete"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1927
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1930
msgid "Sort by packets received more than once"
-msgstr "Sortieren nach Anzahl mehr als einmal empfangener Pakete"
+msgstr "Sortieren nach Anzahl mehrfach empfangener Pakete"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1948
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1951
msgid "We offered to introduce them"
-msgstr "Wir bieten an diese bekannt zu machen"
+msgstr "Wir bieten an, diese bekannt zu machen"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1950
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1953
msgid "They offered to introduce us"
-msgstr "Diese bieten an uns bekannt zu machen"
+msgstr "Diese boten an, uns bekannt zu machen"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1954
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1957
msgid "Choked"
msgstr "gedrosselt"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1962
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1965
msgid "1 fail"
msgstr "1 Fehler"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1964
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1967
#, java-format
msgid "{0} fails"
msgstr "{0} fehlgeschlagen"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1970
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1973
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:162
msgid "Banned"
msgstr "Gesperrt"
#. buf.append("<tr><td colspan=\"16\"><hr></td></tr>\n");
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2102
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2105
msgid "SUMMARY"
msgstr "ZUSAMMENFASSUNG"
#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:145
msgid "Dropping tunnel requests: Too slow"
-msgstr "Lasse Tunnelanfragen unbeantwortet: zu langsam"
+msgstr "Ignoriere Tunnelanfragen: zu langsam"
#. don't even bother, since we are so overloaded locally
#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:352
msgid "Dropping tunnel requests: Overloaded"
-msgstr "Lasse Tunnelanfragen unbeantwortet: Ãœberlast"
+msgstr "Ignoriere Tunnelanfragen: überlastet"
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:523
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:525
msgid "Rejecting tunnels: Request overload"
-msgstr "Weise Tunnelanfragen ab: Ãœberlast angefragt"
+msgstr "Weise Tunnelanfragen zurück: Überlast an Anfragen"
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:548
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:550
msgid "Rejecting tunnels: Connection limit"
-msgstr "Weise Tunnelanfragen ab: Verbindungslimit erreicht"
+msgstr "Weise Tunnelanfragen zurück: Verbindungslimit erreicht"
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:742
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:744
msgid "Dropping tunnel requests: High load"
-msgstr "Lasse Tunnelanfragen unbeantwortet: Hohe Last"
+msgstr "Ignoriere Tunnelanfragen: Hohe Last"
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:751
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:753
msgid "Dropping tunnel requests: Queue time"
-msgstr "Lasse Tunnelanfragen unbeantwortet: Zu lange unbeantwortet"
+msgstr "Ignoriere Tunnelanfragen: zu lange Warteschlange"
#. Automatically generated pseudo-java for xgettext - do not edit
#. Translators may wish to translate a few of these, do not bother to translate all of them!!
@@ -643,7 +643,7 @@ msgstr "Zentralafrikanische Republik"
#: ../java/build/Countries.java:42
msgid "Congo"
-msgstr "Demokratische Republik Kongo"
+msgstr "Republik Kongo"
#: ../java/build/Countries.java:43
msgid "Switzerland"
@@ -903,7 +903,7 @@ msgstr "Jamaika"
#: ../java/build/Countries.java:109
msgid "Jordan"
-msgstr "Jardanien"
+msgstr "Jordanien"
#: ../java/build/Countries.java:110
msgid "Japan"
@@ -991,11 +991,11 @@ msgstr "Lettland"
#: ../java/build/Countries.java:131
msgid "Libyan Arab Jamahiriya"
-msgstr "Arabische Islamische Republik"
+msgstr "Libysch-Arabische Islamische Republik"
#: ../java/build/Countries.java:132
msgid "Morocco"
-msgstr "Morokko"
+msgstr "Marokko"
#: ../java/build/Countries.java:133
msgid "Monaco"
@@ -1295,7 +1295,7 @@ msgstr "Thailand"
#: ../java/build/Countries.java:209
msgid "Tajikistan"
-msgstr "Tadshikistan"
+msgstr "Tadschikistan"
#: ../java/build/Countries.java:210
msgid "Tokelau"
@@ -1351,7 +1351,7 @@ msgstr "Amerikanisch-Ozeanien"
#: ../java/build/Countries.java:223
msgid "United States"
-msgstr "Vereinigte Staaten"
+msgstr "Vereinigte Staaten von Amerika"
#: ../java/build/Countries.java:224
msgid "Uruguay"
@@ -1420,11 +1420,11 @@ msgstr "Simbabwe"
#: ../java/strings/Strings.java:29
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/index_jsp.java:234
msgid "I2P Router Console"
-msgstr "I2P Router Konsole"
+msgstr "I2P-Routerkonsole"
#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:57
msgid "Error updating the configuration - please see the error logs"
-msgstr "Fehler beim Aktualisieren der Einstellungen - bitte schaue in den Fehlerberichten nach"
+msgstr "Fehler beim Aktualisieren der Einstellungen - Bitte schau in die Fehlerberichte!"
#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:69
#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:266
@@ -1434,17 +1434,17 @@ msgstr "Einstellungen erfolgreich gespeichert"
#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71
#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:268
msgid "Error saving the configuration (applied but not saved) - please see the error logs"
-msgstr "Fehler beim Speichern der Einstellungen (angewendet aber nicht gespeichert) - bitte schaue in den Fehlerberichten nach"
+msgstr "Fehler beim Speichern der Einstellungen (angewendet aber nicht gespeichert) - Bitte schau in die Fehlerberichte!"
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:34
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:334
msgid "Save Client Configuration"
-msgstr "Speichere Klient Einstellungen"
+msgstr "Speichere Klient-Einstellungen"
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:38
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:346
msgid "Save WebApp Configuration"
-msgstr "Speichere WebApplikations Einstellungen"
+msgstr "Speichere WebApplikations-Einstellungen"
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:42
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:356
@@ -1459,12 +1459,12 @@ msgstr "Zusatzprogramm installieren"
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:82
#, java-format
msgid "Deleted plugin {0}"
-msgstr "Gelöschtes Zusatzprogramm {0}"
+msgstr "Zusatzprogramm {0} gelöscht"
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:84
#, java-format
msgid "Error deleting plugin {0}"
-msgstr "Fehler beim Löschen vom Zusatzprogramm {0}"
+msgstr "Fehler beim Löschen des Zusatzprogramms {0}"
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:96
#, java-format
@@ -1474,13 +1474,13 @@ msgstr "Zusatzprogramm {0} angehalten"
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:98
#, java-format
msgid "Error stopping plugin {0}"
-msgstr "Fehler beim Stoppen des Zusatzprogrammes {0}"
+msgstr "Fehler beim Stoppen des Zusatzprogramms {0}"
#. label (IE)
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:119
#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:189
msgid "Start"
-msgstr "Start"
+msgstr "Starten"
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:138
#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:49
@@ -1494,7 +1494,7 @@ msgstr "Neuer Klient hinzugefügt"
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:188
msgid "Client configuration saved successfully - restart required to take effect."
-msgstr "Klient Einstellungen erfolgreich gespeichert - Neustart zum Ãœbernehmen erforderlich"
+msgstr "Klient-Einstellungen erfolgreich gespeichert - Neustart zum Ãœbernehmen erforderlich"
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:202
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:213
@@ -1524,7 +1524,7 @@ msgstr "WebApp Einstellungen gespeichert."
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:251
msgid "Plugin configuration saved."
-msgstr "Einstellungen des Zusatzprogrammes gespeichert."
+msgstr "Einstellungen des Zusatzprogramms gespeichert."
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:266
#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:58
@@ -1541,22 +1541,22 @@ msgstr "Konnte keinen Server finden"
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:279
msgid "No plugin URL specified."
-msgstr "Keine Zusatzprogramm URL angegeben."
+msgstr "Keine URL des Zusatzprogramms angegeben"
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:289
#, java-format
msgid "No update URL specified for {0}"
-msgstr "Keine Update URL angegeben für {0}"
+msgstr "Keine Update-URL angegeben für {0}"
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:297
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:302
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:315
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:320
msgid "Plugin or update download already in progress."
-msgstr "Herunterladen des Zusatzprogrammes oder Updates schon aktiv."
+msgstr "Zusatzprogramm oder Aktualisierung wird bereits heruntergeladen."
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:306
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:117
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:118
#, java-format
msgid "Downloading plugin from {0}"
msgstr "Lade Zusatzprogramm herunter von {0}"
@@ -1564,7 +1564,7 @@ msgstr "Lade Zusatzprogramm herunter von {0}"
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:324
#, java-format
msgid "Checking plugin {0} for updates"
-msgstr "Zusatzprogramm {0} auf Updates prüfen"
+msgstr "Zusatzprogramm {0} auf Aktualisierungen prüfen"
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:334
#, java-format
@@ -1574,12 +1574,12 @@ msgstr "Zusatzprogramm {0} gestartet"
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:336
#, java-format
msgid "Error starting plugin {0}"
-msgstr "Fehler beim Starten des Zusatzprogrammes {0}"
+msgstr "Fehler beim Starten des Zusatzprogramms {0}"
#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:21
#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:192
msgid "Edit"
-msgstr "Edit"
+msgstr "Bearbeiten"
#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:30
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:330
@@ -1613,14 +1613,14 @@ msgid "Plugin"
msgstr "Zusatzprogramm"
#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:95
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:268
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:271
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
msgid "Version"
msgstr "Version"
#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:97
msgid "Signed by"
-msgstr "Signiert von"
+msgstr "unterschrieben von"
#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:114
msgid "Date"
@@ -1628,7 +1628,7 @@ msgstr "Datum"
#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:120
msgid "Author"
-msgstr "Author"
+msgstr "Autor"
#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:136
msgid "License"
@@ -1644,7 +1644,7 @@ msgstr "Adresse des Updates"
#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:194
msgid "Stop"
-msgstr "Stop"
+msgstr "Stopp"
#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:196
#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:81
@@ -1662,7 +1662,7 @@ msgstr "Aktualisierung"
#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:202
#, java-format
msgid "Are you sure you want to delete {0}?"
-msgstr "Sind Sie sicher, das sie {0} löschen wollen?"
+msgstr "Sind Sie sicher, dass Sie {0} löschen wollen?"
#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:204
msgid "Delete"
@@ -1671,12 +1671,12 @@ msgstr "löschen"
#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:18
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:324
msgid "Add key"
-msgstr "Füge Schlüssel hinzu"
+msgstr "Schlüssel hinzufügen"
#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:19
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:322
msgid "Delete key"
-msgstr "Lösche Schlüssel"
+msgstr "Schlüssel löschen"
#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:21
msgid "You must enter a destination"
@@ -1694,7 +1694,7 @@ msgstr "Schlüssel für"
#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:34
msgid "added to keyring"
-msgstr "dem Schlüsselring hinzugefügt"
+msgstr "zum Schlüsselbund hinzugefügt"
#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:36
msgid "Invalid destination or key"
@@ -1702,48 +1702,64 @@ msgstr "Ungültiges Ziel oder Schlüssel"
#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:41
msgid "removed from keyring"
-msgstr "vom Schlüsselring gelöscht"
+msgstr "aus dem Schlüsselbund gelöscht"
#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:43
msgid "not found in keyring"
-msgstr "nicht im Schlüsselring gefunden"
+msgstr "nicht im Schlüsselbund gefunden"
#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:45
msgid "Invalid destination"
msgstr "Ungültiges Ziel"
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:82
+msgid "Log overrides updated"
+msgstr "Zusatzoptionen zu Berichten aktualisiert"
+
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:160
+msgid "Log configuration saved"
+msgstr "Einstellungen der Berichte gespeichert."
+
+#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:48
msgid "Add additional logging statements above. Example: net.i2p.router.tunnel=WARN"
-msgstr "Fügen Sie weitere Anweisungen zum Bericht oben hinzu. Zum Beispiel: net.i2p.router.tunnel=WARN"
+msgstr "Fügen Sie weitere Log-Anweisungen oben hinzu. Zum Beispiel: net.i2p.router.tunnel=WARN"
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:47
+#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:49
msgid "Or put entries in the logger.config file. Example: logger.record.net.i2p.router.tunnel=WARN"
-msgstr "Oder machen sie Einträge in die logger.config Datei. Zum Beispiel: net.i2p.router.tunnel=WARN"
+msgstr "Oder machen sie Einträge in die logger.config-Datei. Zum Beispiel: net.i2p.router.tunnel=WARN"
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:50
msgid "Valid levels are DEBUG, INFO, WARN, ERROR, CRIT"
-msgstr "Gültige Level sind: DEBUG, INFO, WARN, ERROR, CRIT"
+msgstr "Gültige Stufen sind: DEBUG, INFO, WARN, ERROR, CRIT"
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52
+#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
msgid "CRIT"
msgstr "KRITISCH"
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52
+#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
msgid "DEBUG"
msgstr "DEBUG"
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52
+#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
msgid "ERROR"
msgstr "FEHLER"
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52
+#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
msgid "INFO"
msgstr "INFO"
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52
+#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
msgid "WARN"
msgstr "WARNUNG"
+#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
+msgid "Remove"
+msgstr "Entfernen"
+
+#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:125
+msgid "Select a class to add"
+msgstr "Klasse auswählen"
+
#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:199
msgid "Network"
@@ -1771,7 +1787,7 @@ msgstr "Klienten"
#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:292
msgid "Keyring"
-msgstr "Schlüsselring"
+msgstr "Schlüsselbund"
#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
msgid "Logging"
@@ -1785,7 +1801,7 @@ msgid "Peers"
msgstr "Teilnehmer"
#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:382
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:387
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
msgid "Stats"
msgstr "Statistiken"
@@ -1800,7 +1816,7 @@ msgstr "Erweitert"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:359
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:515
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:339
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:375
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:343
msgid "Save changes"
@@ -1816,11 +1832,11 @@ msgstr "Aktualisiere die IP-Adresse"
#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:171
msgid "Disabling TCP completely"
-msgstr "Deaktiviere TCP komplett"
+msgstr "Deaktiviere TCP vollständig"
#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:175
msgid "Updating inbound TCP address to"
-msgstr "Aktualisiere eingehende TCP Adresse auf"
+msgstr "Aktualisiere eingehende TCP-Adresse auf"
#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:179
msgid "Disabling inbound TCP"
@@ -1852,7 +1868,7 @@ msgstr "Kontrollierter Neustart in den verborgenen Router-Modus"
#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:223
msgid "Gracefully restarting to exit Hidden Router Mode"
-msgstr "Kontrollierter Neustart um den verborgenen Router-Modus zu verlassen"
+msgstr "Kontrollierter Neustart, um den Verborgener-Router-Modus zu verlassen"
#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:232
msgid "Enabling UPnP, restart required to take effect"
@@ -1864,25 +1880,25 @@ msgstr "Deaktiviere UPnP, Neustart erforderlich um wirksam zu werden"
#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:242
msgid "Enabling laptop mode"
-msgstr "Laptop Modus aktivieren"
+msgstr "Laptop-Modus aktivieren"
#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:244
msgid "Disabling laptop mode"
-msgstr "Laptop Modus deaktivieren"
+msgstr "Laptop-Modus deaktivieren"
#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:250
msgid "Requiring SSU introducers"
-msgstr "Benötige SSU Hilfsrouter"
+msgstr "Benötige SSU-Hilfsrouter"
#. There's a few changes that don't really require restart (e.g. enabling inbound TCP)
#. But it would be hard to get right, so just do a restart.
#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:291
msgid "Gracefully restarting I2P to change published router address"
-msgstr "Starte I2P elegant neu, um die publizierte Router Adresse zu ändern"
+msgstr "Starte I2P kontrolliert neu, um die veröffentlichte Router-Adresse zu ändern"
#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:314
msgid "Updating bandwidth share percentage"
-msgstr "Aktualisiere den Anteil der zur Verfügung gestellter Bandbreite"
+msgstr "Aktualisiere den Anteil der zur Verfügung gestellten Bandbreite"
#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:397
msgid "Updated bandwidth limits"
@@ -1908,7 +1924,7 @@ msgstr "oder maximal {0} Bytes im Monat"
#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:20
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:314
msgid "Ban peer until restart"
-msgstr "Verbanne den Kontakt bis zum Neustart"
+msgstr "Den Teilnehmer bis zum Neustart sperren"
#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:23
#, java-format
@@ -1928,7 +1944,7 @@ msgstr "Ungültiger Teilnehmer"
#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:28
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:316
msgid "Unban peer"
-msgstr "Hebe die Verbannung des Kontaktes auf"
+msgstr "Sperrung des Teilnehmers aufheben"
#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:33
msgid "unbanned"
@@ -1941,7 +1957,7 @@ msgstr "ist zur Zeit nicht gesperrt"
#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:39
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:322
msgid "Adjust Profile Bonuses"
-msgstr "korrigiere Profilboni"
+msgstr "Profilboni anpassen"
#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:47
msgid "Bad speed value"
@@ -1970,7 +1986,7 @@ msgstr "Starte I2P doch nicht neu"
#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:39
msgid "Restart immediately"
-msgstr "Neustart bevorstehend"
+msgstr "Sofortiger Neustart"
#. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns
#. give the UI time to respond
@@ -1988,7 +2004,7 @@ msgstr "Neustart bevorstehend"
#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:61
msgid "Shutdown imminent"
-msgstr "Ausschaltung bevorstehend"
+msgstr "Abschalten bevorstehend"
#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:65
#, java-format
@@ -2042,7 +2058,7 @@ msgstr "Harter Neustart angefordert"
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:72
msgid "Rekey and Restart"
-msgstr "Hole neue RouterID und starte neu"
+msgstr "neue RouterID erstellen und neustarten"
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:73
msgid "Rekeying after graceful restart"
@@ -2050,7 +2066,7 @@ msgstr "Neue RouterID nach sanftem Neustart"
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:76
msgid "Rekey and Shutdown"
-msgstr "Neue RouterID und I2P beenden"
+msgstr "neue RouterID generieren und I2P beenden"
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:77
msgid "Rekeying after graceful shutdown"
@@ -2069,44 +2085,44 @@ msgstr "Starte I2P nicht beim Systemstart"
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:84
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:354
msgid "Dump threads"
-msgstr "Gebe Threadliste aus"
+msgstr "Threadliste ausgeben"
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:91
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:322
msgid "Show systray icon"
-msgstr "Zeige Systemtray Icon"
+msgstr "Systemtray-Icon anzeigen"
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:96
msgid "System tray icon enabled."
-msgstr "Systemtray Icon aktiviert"
+msgstr "Systemtray-Icon aktiviert"
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:98
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:110
msgid "System tray icon feature not supported on this platform. Sorry!"
-msgstr "Systemtry Icon wird auf diesem System nicht unterstützt. Sorry!"
+msgstr "Systemtry-Icon wird auf diesem System leider nicht unterstützt."
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:101
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:113
msgid "Warning: unable to contact the systray manager"
-msgstr "Warnung: kann den Systemtray Manager nicht erreichen"
+msgstr "Warnung: kann den Systemtray-Manager nicht erreichen"
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:103
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:324
msgid "Hide systray icon"
-msgstr "Verstecke das Systemtray Icon"
+msgstr "Systemtray-Icon deaktivieren"
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:108
msgid "System tray icon disabled."
-msgstr "Systemtry Icon deaktiviert"
+msgstr "Systemtry-Icon deaktiviert"
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:115
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:362
msgid "View console on startup"
-msgstr "Zeige die Konsole beim Starten"
+msgstr "Zeige die Konsole nach dem Starten"
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:117
msgid "Console is to be shown on startup"
-msgstr "Konsole wird beim Starten angezeigt"
+msgstr "Konsole wird nach dem Starten angezeigt"
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:118
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:364
@@ -2143,13 +2159,13 @@ msgstr "Konnte Statusfilter und Speicherort nicht aktualisieren"
#: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:121
msgid "Graph list updated, may take up to 60s to be reflected here and on the <a href=\"graphs.jsp\">Graphs Page</a>"
-msgstr "Liste der Graphen aktualisiert, es braucht bis zu 60s um hier und auf <a href=\"graphs.jsp\">Graphenseite</a> angezeigt zu werden"
+msgstr "Liste der Grafiken aktualisiert. Es dauert bis zu 60s, um hier und auf <a href=\"graphs.jsp\">Graphenseite</a> angezeigt zu werden."
#. the count isn't really correct anyway, since we don't check for actual changes
#. addFormNotice("Updated settings for " + updated + " pools.");
#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:137
msgid "Updated settings for all pools."
-msgstr "Alle Einstellungen für alle Gruppen aktualisiert"
+msgstr "Einstellungen für alle Gruppen aktualisiert"
#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:142
msgid "Exploratory tunnel configuration saved successfully."
@@ -2160,7 +2176,7 @@ msgstr "Erkundungstunneleinstellungen erfolgreich gespeichert"
msgid "Error saving the configuration (applied but not saved) - please see the error logs."
msgstr ""
"Fehler beim Speichern der Einstellungen (angewendet aber nicht gespeichert)\n"
-"- schaue bitte in den Fehlerberichten nach"
+"- sieh bitte in die Fehlerberichte!"
#. * dummies for translation
#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:14
@@ -2189,19 +2205,19 @@ msgstr "Kliententunnel für"
#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:69
msgid "ANONYMITY WARNING - Settings include 0-hop tunnels."
-msgstr "ANONYMITÄTSWARNUNG - Einstellung beinhaltet Tunnel ohne Zwischenstationen"
+msgstr "ANONYMITÄTSWARNUNG - Einstellungen beinhalten Tunnel ohne Zwischenstationen"
#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:74
msgid "ANONYMITY WARNING - Settings include 1-hop tunnels."
-msgstr "ANONYMITÄTSWARNUNG - Einstellung beinhaltet Tunnel mit nur 1 Zwischenstation"
+msgstr "ANONYMITÄTSWARNUNG - Einstellungen beinhalten Tunnel mit nur einer Zwischenstation"
#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:77
msgid "PERFORMANCE WARNING - Settings include very long tunnels."
-msgstr "PERFORMANCEWARNUNG - Einstellungen beinhaltet sehr lange Tunnel"
+msgstr "LEISTUNGSWARNUNG - Einstellungen beinhalten sehr lange Tunnel"
#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:80
msgid "PERFORMANCE WARNING - Settings include high tunnel quantities."
-msgstr "PERFORMANCEWARNUNG - Einstellungen beinhalten sehr viele Tunnel"
+msgstr "LEISTUNGSWARNUNG - Einstellungen beinhalten sehr viele Tunnel"
#. buf.append("<tr><th></th><th>Inbound</th><th>Outbound</th></tr>\n");
#. tunnel depth
@@ -2226,19 +2242,19 @@ msgstr "Anzahl der Ersatztunnel"
#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:167
msgid "Inbound options"
-msgstr "Optionen für Eingehendes"
+msgstr "Optionen für eingehende Tunnel"
#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:180
msgid "Outbound options"
-msgstr "Optionen für Ausgehendes"
+msgstr "Optionen für ausgehende Tunnel"
#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:31
msgid "Theme change saved."
-msgstr "Änderung an der Oberfläche gespeichert"
+msgstr "Änderung an der grafischen Oberfläche gespeichert"
#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:33
msgid "Refresh the page to view."
-msgstr "Um dieses zu sehen lade die Seite neu"
+msgstr "Laden Sie die Seite neu, damit die Änderungen sichtbar werden!"
#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:51
msgid "English"
@@ -2270,11 +2286,11 @@ msgstr "Schwedisch"
#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:88
msgid "Update available, attempting to download now"
-msgstr "Aktualisierung verfügbar, versuche diese zu downloaden"
+msgstr "Aktualisierung verfügbar; versuche, diese herunterzuladen"
#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:90
msgid "Update available, click button on left to download"
-msgstr "Aktualisierung verfügbar, klicke auf den Knopf links zum download"
+msgstr "Aktualisierung verfügbar. Klick auf den Knopf links, um sie herunterzuladen!"
#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:96
msgid "No update available"
@@ -2282,7 +2298,7 @@ msgstr "Keine Aktualisierung verfügbar"
#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:104
msgid "Updating news URL to"
-msgstr "Aktualisiere die Adresse für die Neuigkeiten auf"
+msgstr "Aktualisiere die Adresse für die Nachrichten auf"
#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:112
msgid "Updating proxy host to"
@@ -2290,11 +2306,11 @@ msgstr "Aktualisiere den Proxyhost auf"
#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:120
msgid "Updating proxy port to"
-msgstr "Aktualisiere den Port des Proxy auf"
+msgstr "Aktualisiere den Port des Proxys auf"
#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:133
msgid "Updating refresh frequency to"
-msgstr "Aktualisiere die Frequenz des Neuladens auf"
+msgstr "Aktualisiere die Häufigkeit des Neuladens auf"
#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:140
msgid "Updating update policy to"
@@ -2319,7 +2335,7 @@ msgstr "Nie"
#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:90
msgid "Every"
-msgstr "Jedesmal"
+msgstr "Alle"
#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:108
msgid "Notify only"
@@ -2327,15 +2343,15 @@ msgstr "Nur benachrichtigen"
#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:115
msgid "Download and verify only"
-msgstr "Nur downloaden und überprüfen"
+msgstr "Nur herunterladen und überprüfen"
#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:123
msgid "Download, verify, and restart"
-msgstr "Downloaden, überprüfen und neu starten"
+msgstr "Herunterladen, überprüfen und neustarten"
#: ../java/src/net/i2p/router/web/FormHandler.java:163
msgid "Invalid form submission, probably because you used the 'back' or 'reload' button on your browser. Please resubmit."
-msgstr "Ungültige Übertragung der eingegebenen Daten, möglicherweise da Sie den 'Zurück' oder 'neu Laden' Knopf in Ihrem Browser gedrückt haben. Bitte erneut senden."
+msgstr "Ungültige Übertragung der eingegebenen Daten, möglicherweise da Sie den 'Zurück'- oder 'Neu Laden'-Knopf in Ihrem Browser gedrückt haben. Bitte erneut senden."
#: ../java/src/net/i2p/router/web/GraphHelper.java:82
msgid "Combined bandwidth graph"
@@ -2361,7 +2377,7 @@ msgstr "Zeitraum"
#: ../java/src/net/i2p/router/web/GraphHelper.java:133
msgid "Plot averages"
-msgstr "Zeichnet die Mittelwerte"
+msgstr "Zeichne Mittelwerte"
#: ../java/src/net/i2p/router/web/GraphHelper.java:134
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:416
@@ -2371,11 +2387,11 @@ msgstr "oder"
#: ../java/src/net/i2p/router/web/GraphHelper.java:134
msgid "plot events"
-msgstr "zeichne Anzahl"
+msgstr "zeichne konkrete Daten"
#: ../java/src/net/i2p/router/web/GraphHelper.java:135
msgid "Image sizes"
-msgstr "Bildgrösse"
+msgstr "Bildgröße"
#: ../java/src/net/i2p/router/web/GraphHelper.java:135
msgid "width"
@@ -2408,207 +2424,215 @@ msgstr "Minuten"
#: ../java/src/net/i2p/router/web/GraphHelper.java:139
msgid "Redraw"
-msgstr "Zeichne neu"
+msgstr "neuzeichnen"
#: ../java/src/net/i2p/router/web/LogsHelper.java:13
#: ../java/src/net/i2p/router/web/LogsHelper.java:37
msgid "File location"
msgstr "Ort der Datei"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:77
+#: ../java/src/net/i2p/router/web/LogsHelper.java:34
+msgid "File not found"
+msgstr "Datei nicht gefunden"
+
+#: ../java/src/net/i2p/router/web/LogsHelper.java:50
+msgid "No log messages"
+msgstr "Keine Ereignisse"
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:80
msgid "Network Database RouterInfo Lookup"
msgstr "RouterInfo in der Netzwerkdatenbank anschauen"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:95
#: ../java/strings/Strings.java:68
msgid "Router"
msgstr "Router"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:95
msgid "not found in network database"
msgstr "nicht in der Netzwerkdatenbank gefunden"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:104
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:212
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:107
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:215
msgid "Network Database Contents"
-msgstr "Netzwerkdatenbank Inhalt"
+msgstr "Netzwerkdatenbank - Inhalt"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:108
msgid "View RouterInfo"
msgstr "RouterInfo anschauen"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:106
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:109
msgid "LeaseSets"
msgstr "LeaseSets"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:128
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:131
msgid "LeaseSet"
msgstr "LeaseSet"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:130
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:133
msgid "Local"
msgstr "Lokal"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:132
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:135
msgid "Unpublished"
msgstr "Unveröffentlicht"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:133
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:140
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:136
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143
msgid "Destination"
msgstr "Ziel"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:150
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:153
#, java-format
msgid "Expires in {0}"
msgstr "Wird in {0} ungültig"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:152
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:155
#, java-format
msgid "Expired {0} ago"
msgstr "Wurde vor {0} ungültig"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:164
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:167
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:156
msgid "Gateway"
msgstr "Schnittstelle"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:164
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:167
msgid "Lease"
msgstr "Lease"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:166
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:169
msgid "Tunnel"
msgstr "Tunnel"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:212
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:215
msgid "View LeaseSets"
msgstr "Zeige die LeaseSets"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:214
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217
msgid "Not initialized"
msgstr "Nicht initialisiert"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:223
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:226
msgid "Routers"
msgstr "Router"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:225
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:228
msgid "Show all routers"
msgstr "Zeige alle Router"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:227
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:230
msgid "Show all routers with full stats"
-msgstr "Zeige alle Router mit kompletten Statistiken"
+msgstr "Zeige alle Router mit vollständigen Statistiken"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:265
msgid "Network Database Router Statistics"
-msgstr "Statistiken der Netzwerkdatenbank Router"
+msgstr "Netzwerkdatenbank Routerstatistiken"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:268
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:282
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:300
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:271
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:285
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:303
msgid "Count"
msgstr "Anzahl"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:282
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:285
msgid "Transports"
msgstr "Transporte"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:300
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:303
msgid "Country"
msgstr "Land"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:342
msgid "Our info"
-msgstr "Unsere Informationen"
+msgstr "Informationen über uns"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:341
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:344
msgid "Peer info for"
-msgstr "Informationen über den Kontakt"
+msgstr "Informationen über den Teilnehmer"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:345
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:348
msgid "Full entry"
msgstr "Ganzer Eintrag"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:354
#: ../java/src/net/i2p/router/web/SummaryHelper.java:110
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:600
msgid "Hidden"
msgstr "Versteckt"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:354
msgid "Updated"
msgstr "Aktualisiert"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:355
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:358
#, java-format
msgid "{0} ago"
msgstr "vor {0}"
#. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:354
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:358
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:357
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:361
msgid "Published"
msgstr "Veröffentlicht"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:360
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:363
msgid "Address(es)"
msgstr "Adresse(n)"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:373
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:376
msgid "cost"
msgstr "Kosten"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:397
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
msgid "Hidden or starting up"
msgstr "Versteckt oder Startphase"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:397
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
msgid "SSU"
msgstr "SSU"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:397
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
msgid "SSU with introducers"
-msgstr "SSU mit Hilsrouter"
+msgstr "SSU mit Hilfsrouter"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:398
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:403
msgid "NTCP"
msgstr "NTCP"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:398
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:403
msgid "NTCP and SSU"
msgstr "NTCP und SSU"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:398
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:403
msgid "NTCP and SSU with introducers"
msgstr "NTCP und SSU mit Hilfsrouter"
#: ../java/src/net/i2p/router/web/NewsFetcher.java:82
#, java-format
msgid "News last updated {0} ago."
-msgstr "Neueigkeiten wurden vor {0} aktualisiert"
+msgstr "Nachrichten wurden vor {0} aktualisiert"
#: ../java/src/net/i2p/router/web/NewsFetcher.java:88
#, java-format
msgid "News last checked {0} ago."
-msgstr "Vor {0} wurde auf neue Neueigkeiten geprüft"
+msgstr "Vor {0} wurde auf neue Nachrichten geprüft"
#: ../java/src/net/i2p/router/web/PluginUpdateChecker.java:77
#, java-format
msgid "Cannot check, plugin {0} is not installed"
-msgstr "Kann nicht kontrollieren, Zusatzprogramm {0} wurde nicht installiert"
+msgstr "Kann nicht überprüfen, Zusatzprogramm {0} ist nicht installiert"
#: ../java/src/net/i2p/router/web/PluginUpdateChecker.java:129
#, java-format
msgid "Checking for update of plugin {0}"
-msgstr "Auf Updates des Zusatzprogrammes {0} prüfen"
+msgstr "Auf Aktualisierungen des Zusatzprogramms {0} prüfen"
#: ../java/src/net/i2p/router/web/PluginUpdateChecker.java:154
#, java-format
msgid "New plugin version {0} is available"
-msgstr "Neue Version des Zusatzprogrammes {0} ist verfügbar"
+msgstr "Neue Version des Zusatzprogramms {0} ist verfügbar"
#: ../java/src/net/i2p/router/web/PluginUpdateChecker.java:156
#, java-format
@@ -2618,165 +2642,165 @@ msgstr "Keine neue Version des Zusatzprogrammes {0} verfügbar"
#: ../java/src/net/i2p/router/web/PluginUpdateChecker.java:165
#, java-format
msgid "Update check failed for plugin {0}"
-msgstr "Überprüfung auf neue Version des Zusatzprogrammes {0} fehlgeschlagen"
+msgstr "Überprüfung auf neue Version des Zusatzprogramms {0} fehlgeschlagen"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:138
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:139
msgid "Downloading plugin"
msgstr "Lade Zusatzprogramm herunter"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:145
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:146
#: ../java/src/net/i2p/router/web/UpdateHandler.java:179
#, java-format
msgid "{0}B transferred"
msgstr "{0}Bytes übertragen"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:151
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:152
msgid "Plugin downloaded"
msgstr "Zusatzprogramm heruntergeladen"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:156
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:343
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:157
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:344
#, java-format
msgid "Cannot create plugin directory {0}"
-msgstr "Kann kein Verzeichnis für Zusatzprogramm {0} anlegen"
+msgstr "Kann kein Verzeichnis für das Zusatzprogramm {0} anlegen"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:165
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:166
#: ../java/src/net/i2p/router/web/UpdateHandler.java:220
#, java-format
msgid "from {0}"
msgstr "von {0}"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:175
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:176
#, java-format
msgid "Plugin from {0} is corrupt"
-msgstr "Zusatzprogramm von {0} ist korrupt."
+msgstr "Zusatzprogramm von {0} ist beschädigt."
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:186
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:187
#, java-format
msgid "Plugin from {0} does not contain the required configuration file"
msgstr "Zusatzprogramm von {0} enthält nicht die benötigte Konfigurationsdatei"
#. updateStatus("<b>" + "Plugin contains an invalid key" + ' ' + pubkey + ' ' + signer + "</b>");
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:199
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:200
#, java-format
msgid "Plugin from {0} contains an invalid key"
msgstr "Zusatzprogramm von {0} enthält einen ungültigen Schlüssel"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:218
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:227
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:236
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:219
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:228
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:237
#, java-format
msgid "Plugin signature verification of {0} failed"
-msgstr "Überprüfung der Signatur des Zusatzprogrammes {0} ist fehlgeschlagen"
+msgstr "Überprüfung der Signatur des Zusatzprogramms {0} ist fehlgeschlagen"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:251
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:252
#, java-format
msgid "Plugin from {0} has invalid name or version"
msgstr "Zusatzprogramm von {0} hat einen ungültigen Namen oder Version"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:256
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:257
#, java-format
msgid "Plugin {0} has mismatched versions"
msgstr "Zusatzprogramm {0} hat keine passende Version"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:264
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:265
#, java-format
msgid "This plugin requires I2P version {0} or higher"
-msgstr "Dieses Zusatzprogramm benötigt I2P Version {0} oder neuer"
+msgstr "Dieses Zusatzprogramm benötigt I2P-Version {0} oder höher"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:272
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:273
#, java-format
msgid "This plugin requires Java version {0} or higher"
-msgstr "Dieses Zusatzprogramm benötigt Java Version {0} oder neuer"
+msgstr "Dieses Zusatzprogramm benötigt Java-Version {0} oder neuer"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:280
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:281
msgid "Downloaded plugin is for new installs only, but the plugin is already installed"
-msgstr "Heruntergeladenes Zusatzprogramm lässt sich nur neu installieren, aber das Zusatzprogramm ist schon installiert."
+msgstr "Heruntergeladenes Zusatzprogramm lässt sich nur neu installieren, jedoch ist es ist bereits installiert."
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:292
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:293
msgid "Installed plugin does not contain the required configuration file"
msgstr "Das installierte Zusatzprogramm enthält nicht die benötigte Konfigurationsdatei"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:300
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:301
msgid "Signature of downloaded plugin does not match installed plugin"
-msgstr "Signatur des heruntergeladenen Zusatzprogrammes stimmt nicht mit dem installiertem Zusatzprogramm überein"
+msgstr "Die Signatur des heruntergeladenen Zusatzprogramms stimmt nicht mit dem installierten Zusatzprogramm überein."
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:307
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:308
#, java-format
msgid "Downloaded plugin version {0} is not newer than installed plugin"
-msgstr "Heruntergeladenes Zusatzprogramm Version {0} ist nicht neuer als das installierte Zusatzprogramm"
+msgstr "Version {0} des heruntergeladenen Zusatzprogramms ist nicht neuer als die installierte Version"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:314
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:315
#, java-format
msgid "Plugin update requires installed plugin version {0} or higher"
-msgstr "Update des Zusatzprogrammes benötigt die Version {0} des Zusatzprogrammes oder neuer"
+msgstr "Aktualisierung des Zusatzprogramms benötigt Version {0} oder höher des Zusatzprogramms"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:321
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:322
#, java-format
msgid "Plugin update requires installed plugin version {0} or lower"
-msgstr "Update des Zusatzprogrammes benötigt die Version {0} des Zusatzprogrammes oder älter"
+msgstr "Aktualisierung des Zusatzprogramms benötigt installierte Version {0} oder älter des Zusatzprogramms"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:338
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:339
msgid "Plugin is for upgrades only, but the plugin is not installed"
-msgstr "Dieses Zusatzprogramm ist nur für Updates, aber das Zusatzprogramm ist noch nicht installiert"
+msgstr "Dieses Zusatzprogramm ist nur für Aktualisierungen, aber das Zusatzprogramm ist noch nicht installiert"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:351
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:352
#, java-format
msgid "Failed to install plugin in {0}"
-msgstr "Installation des Zusatzprogrammes in {0} ist fehlgeschlagen"
+msgstr "Installation des Zusatzprogramms in {0} ist fehlgeschlagen"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:358
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:359
#, java-format
msgid "Plugin {0} installed, router restart required"
-msgstr "Zusatzprogramm {0} installiert, Neustart des Routers benötigt"
+msgstr "Zusatzprogramm {0} installiert, Neustart des Routers erforderlich"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:360
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:361
#, java-format
msgid "Plugin {0} installed"
-msgstr "Zusatzprogramm {0} ist installiert"
+msgstr "Zusatzprogramm {0} wurde installiert"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:369
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:370
#, java-format
msgid "Plugin {0} installed and started"
msgstr "Zusatzprogramm {0} installiert und gestartet"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:371
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:372
#, java-format
msgid "Plugin {0} installed but failed to start, check logs"
-msgstr "Zusatzprogramm {0} ist installiert konnte jedoch nicht gestartet werden, überprüfen Sie die Berichte"
+msgstr "Zusatzprogramm {0} wurde installiert konnte jedoch nicht gestartet werden. Überprüfen Sie die Berichte!"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:373
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:374
#, java-format
msgid "Plugin {0} installed but failed to start"
msgstr "Zusatzprogramm {0} ist installiert, startet jedoch nicht"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:383
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:384
#, java-format
msgid "Failed to download plugin from {0}"
msgstr "Konnte Zusatzprogramm von {0} nicht herunterladen"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:72
msgid "Peer Profiles"
-msgstr "Kontakt Profile"
+msgstr "Teilnehmerprofile"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:73
#, java-format
msgid "Showing {0} recent profiles."
-msgstr "Zeige {0} aktuelle Profile"
+msgstr "Zeige {0} aktuelle Profile."
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:75
#, java-format
msgid "Hiding {0} older profiles."
-msgstr "Zeige {0} alte Profile nicht an"
+msgstr "Zeige {0} alte Profile nicht an."
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:77
#, java-format
msgid "Hiding {0} standard profiles."
-msgstr "Zeige {0} Standardprofile nicht an"
+msgstr "Zeige {0} Standardprofile nicht an."
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:82
msgid "Groups (Caps)"
-msgstr "Gruppe (Werte)"
+msgstr "Gruppen (Kategorien)"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:83
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:251
@@ -2801,11 +2825,11 @@ msgstr "Status"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:126
msgid "Fast, High Capacity"
-msgstr "Schnell, hohe Kapazität"
+msgstr "schnell, hohe Kapazität"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:127
msgid "High Capacity"
-msgstr "Hohe Kapazität"
+msgstr "hohe Kapazität"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:128
msgid "Standard"
@@ -2814,12 +2838,12 @@ msgstr "Standard"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:129
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:163
msgid "Failing"
-msgstr "Versagend"
+msgstr "fehlgeschlagen"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:281
msgid "Integrated"
-msgstr "Integriert"
+msgstr "integriert"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:164
msgid "Unreachable"
@@ -2828,7 +2852,7 @@ msgstr "Unerreichbar"
#. hide if < 10%
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:171
msgid "Test Fails"
-msgstr "Test schlägt fehl"
+msgstr "Test fehlgeschlagen"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:175
msgid "profile"
@@ -2836,39 +2860,39 @@ msgstr "Profil"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:184
msgid "Floodfill and Integrated Peers"
-msgstr "Floodfill und integrierte Kontakte"
+msgstr "Floodfill und integrierte Teilnhemer"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:188
msgid "Caps"
-msgstr "Werte"
+msgstr "Kategorien"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:189
msgid "Integ. Value"
-msgstr "Integrations Wert"
+msgstr "Integrationswert"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:190
msgid "Last Heard About"
-msgstr "Letzte Nachricht emfangen"
+msgstr "Zuletzt etwas über ihn gehört"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:191
msgid "Last Heard From"
-msgstr "Letztens davon gehört"
+msgstr "Letzte Nachricht empfangen"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:192
msgid "Last Good Send"
-msgstr "Letzter gute Aussendung"
+msgstr "Letzte geglückte Sendung"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:193
msgid "Last Bad Send"
-msgstr "Letzte schlechte Aussendung"
+msgstr "Letzte fehlgeschlagene Sendung"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:194
msgid "10m Resp. Time"
-msgstr "10min Antwortzeit"
+msgstr "10 Min. Antwortzeit"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:195
msgid "1h Resp. Time"
-msgstr "1h Antwortzeit"
+msgstr "1 Std. Antwortzeit"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:196
msgid "1d Resp. Time"
@@ -2876,43 +2900,43 @@ msgstr "1 Tag Antwortzeit"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:197
msgid "Last Good Lookup"
-msgstr "Letzte gute Suche"
+msgstr "Letzte erfolgreiche Suche"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:198
msgid "Last Bad Lookup"
-msgstr "Letzte schlechte Suche"
+msgstr "Letzte fehlgeschlagene Suche"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:199
msgid "Last Good Store"
-msgstr "Letzte gute Sicherung"
+msgstr "Letztes erfolgreiches Speichern"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200
msgid "Last Bad Store"
-msgstr "Letzte schlechte Sicherung"
+msgstr "Letztes fehlgeschlagene Speichern"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:201
msgid "1h Fail Rate"
-msgstr "1h Fehlerrate"
+msgstr "stündl. Fehlerrate"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202
msgid "1d Fail Rate"
-msgstr "1 Tag Fehlerrate"
+msgstr "tägl. Fehlerrate"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:250
msgid "Thresholds"
-msgstr "Grenzwert"
+msgstr "Grenzwerte"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:252
msgid "fast peers"
-msgstr "schnelle Kontakte"
+msgstr "schnelle Teilnehmer"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:254
msgid "high capacity peers"
-msgstr "Kontakte hohe Kapazität"
+msgstr "Teilnehmer hoher Kapazität"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:256
msgid " well integrated peers"
-msgstr "gut integrierte Kontakte"
+msgstr "gut integrierte Teilnehmer"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:258
msgid "as determined by the profile organizer"
@@ -2924,17 +2948,17 @@ msgstr "Gruppen"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259
msgid "capabilities in the netDb, not used to determine profiles"
-msgstr "Kapazitäten in der Netzwerkdatenbank, nicht zum ermitteln der Profile verwendet"
+msgstr "Werte in der Netzwerkdatenbank, nicht zum Ermitteln der Profile verwendet"
#. capabilities
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259
#: ../java/strings/Strings.java:81
msgid "caps"
-msgstr "Werte"
+msgstr "Kategorien"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260
msgid "peak throughput (bytes per second) over a 1 minute period that the peer has sustained in a single tunnel"
-msgstr "Maximaler Durchsatz (Byte je Tunnel) über den Zeitraum von einer Minute den ein Kontakt in einem Tunnel erreicht hat"
+msgstr "maximaler Durchsatz (Bytes je Tunnel) innerhalb einer Minute, den ein Teilnehmer in einem einzelnen Tunnel erreicht hat"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260
msgid "speed"
@@ -2946,11 +2970,11 @@ msgstr "Kapazität"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261
msgid "how many tunnels can we ask them to join in an hour?"
-msgstr "Wie viele Tunnelnachfragen pro Stunde können wir bei ihm nachfragen?"
+msgstr "Wie viele Tunnel können wir bei diesem Teilnehmer innerhalb einer Stunde bekommen?"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262
msgid "how many new peers have they told us about lately?"
-msgstr "Wie viele neue Kontakte haben sie uns die letzte Zeit genannt?"
+msgstr "Wie viele neue Kontakte hat dieser Teilnehmer uns kürzlich mitgeteilt?"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262
msgid "integration"
@@ -2958,7 +2982,7 @@ msgstr "Integration"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263
msgid "is the peer banned, or unreachable, or failing tunnel tests?"
-msgstr "Ist der Kontakt gesperrt, unerreichbar oder schlagen die Tunneltests fehl?"
+msgstr "Ist der Teilnehmer gesperrt, unerreichbar, oder schlagen die Tunneltests fehl?"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263
msgid "status"
@@ -2966,12 +2990,12 @@ msgstr "Status"
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:313
msgid "n/a"
-msgstr "n/a"
+msgstr "k.A."
#: ../java/src/net/i2p/router/web/ShitlistRenderer.java:57
#, java-format
msgid "Temporary ban expiring in {0}"
-msgstr "Zeitweise endet in {0}"
+msgstr "vorübergehende Sperrung endet in {0}"
#: ../java/src/net/i2p/router/web/ShitlistRenderer.java:59
#, java-format
@@ -2980,28 +3004,28 @@ msgstr "Gesperrt bis zum Neustart oder in {0}"
#: ../java/src/net/i2p/router/web/ShitlistRenderer.java:71
msgid "unban now"
-msgstr "Hebe den Bann jetzt auf"
+msgstr "Bann aufheben"
#. Note to translators: all runtime zh translation disabled in this file, no font available in RRD
#: ../java/src/net/i2p/router/web/StatSummarizer.java:174
msgid "Bandwidth usage"
-msgstr "genutzte Bandbreite"
+msgstr "Bandbreitennutzung"
#: ../java/src/net/i2p/router/web/StatSummarizer.java:181
msgid "Outbound bytes/sec"
-msgstr "Ausgehende Bytes/sek"
+msgstr "Ausgehende Bytes/Sek."
#. def.line(sendName, Color.BLUE, "Outbound bytes/sec", 3);
#: ../java/src/net/i2p/router/web/StatSummarizer.java:183
msgid "Inbound bytes/sec"
-msgstr "Eingehende Bytes/sek"
+msgstr "Eingehende Bytes/Sek."
#: ../java/src/net/i2p/router/web/StatSummarizer.java:186
#: ../java/src/net/i2p/router/web/StatSummarizer.java:187
#: ../java/src/net/i2p/router/web/StatSummarizer.java:188
#: ../java/src/net/i2p/router/web/StatSummarizer.java:189
msgid "bytes/sec"
-msgstr "Bytes/sek"
+msgstr "Bytes/Sek."
#: ../java/src/net/i2p/router/web/StatSummarizer.java:186
msgid "out average"
@@ -3027,15 +3051,15 @@ msgstr "Zur Laufzeit dieses Routers gesammelte Statistiken"
#: ../java/src/net/i2p/router/web/StatsGenerator.java:62
msgid "The data gathered is quantized over a 1 minute period, so should just be used as an estimate."
-msgstr "Die gesammelten Daten wurden nur über 1 Minute gesammelt und sollten somit nur als Näherung betrachtet werden"
+msgstr "Die Daten werden über jeweils 1 Minute erhoben und repräsentieren daher nur eine Näherung."
#: ../java/src/net/i2p/router/web/StatsGenerator.java:108
msgid "frequency"
-msgstr "Frequenz"
+msgstr "Häufigkeit"
#: ../java/src/net/i2p/router/web/StatsGenerator.java:142
msgid "No lifetime events"
-msgstr "Keine Events bisher"
+msgstr "Bisher keine Ereignisse"
#: ../java/src/net/i2p/router/web/StatsGenerator.java:154
msgid "rate"
@@ -3043,15 +3067,15 @@ msgstr "Rate"
#: ../java/src/net/i2p/router/web/StatsGenerator.java:156
msgid "avg value"
-msgstr "Durchschnittlicher Wert"
+msgstr "Durchschnitt"
#: ../java/src/net/i2p/router/web/StatsGenerator.java:185
msgid "events"
-msgstr "Events"
+msgstr "Ereignisse"
#: ../java/src/net/i2p/router/web/StatsGenerator.java:191
msgid "No events"
-msgstr "Keine Events"
+msgstr "Keine Ereignisse"
#: ../java/src/net/i2p/router/web/StatsGenerator.java:197
msgid "lifetime average"
@@ -3076,15 +3100,15 @@ msgstr "Hilfe & FAQ"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:54
msgid "Configure startup of clients and webapps (services); manually start dormant services"
-msgstr "Einstellungen zu Klienten und WebApplikationen (Services); manuelles Starten der ruhenden Services"
+msgstr "Autostart-Einstellungen der Klienten und WebApplikationen (Services); manuelles Starten der ruhenden Services"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:56
msgid "I2P Services"
-msgstr "I2P Dienste"
+msgstr "I2P-Dienste"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:62
msgid "Manage your I2P hosts file here (I2P domain name resolution)"
-msgstr "Verwalten Sie Ihre I2P Adressen hier (I2P-Namensauflösung)"
+msgstr "Verwalten Sie Ihre I2P-Adressen hier (I2P-Namensauflösung)"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:64
msgid "Addressbook"
@@ -3092,7 +3116,7 @@ msgstr "Adressbuch"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:68
msgid "Built-in anonymous BitTorrent Client"
-msgstr "Integrierter anonymer BitTorrent Klient"
+msgstr "Integrierter anonymer BitTorrent-Klient"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:70
msgid "Torrents"
@@ -3100,7 +3124,7 @@ msgstr "BitTorrent"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:74
msgid "Anonymous webmail client"
-msgstr "Webmail-Klient für anonymes E-Mail"
+msgstr "Webmail-Klient für anonyme E-Mail"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:76
msgid "Webmail"
@@ -3108,7 +3132,7 @@ msgstr "Webmail"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:80
msgid "Anonymous resident webserver"
-msgstr "Residenter anonymoer Webserver"
+msgstr "Residenter anonymer Webserver"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:82
msgid "Webserver"
@@ -3120,21 +3144,21 @@ msgstr "Konfiguration des I2P-Routers"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:92
msgid "I2P Internals"
-msgstr "I2P Interna"
+msgstr "Router-Einstellungen"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:98
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:374
msgid "View existing tunnels and tunnel build status"
-msgstr "Betrachte die existierenden Tunnel und den Status der Tunnelerstellung"
+msgstr "Betrachte die existierenden Tunnel und den Status des Tunnelaufbaus"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:104
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253
msgid "Show all current peer connections"
-msgstr "Zeige alle derzeitigen Verbindungen zu Teilnehmern"
+msgstr "Zeige alle bestehenden Verbindungen zu Teilnehmern"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:110
msgid "Show recent peer performance profiles"
-msgstr "Zeige aktuelle Performanceprofile der Kontakte"
+msgstr "Zeige aktuelle Leistungsprofile der Teilnehmer"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:112
msgid "Profiles"
@@ -3142,7 +3166,7 @@ msgstr "Profile"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:116
msgid "Show list of all known I2P routers"
-msgstr "Eine Liste aller bekannten I2P Router anzeigen"
+msgstr "Eine Liste aller bekannten I2P-Router anzeigen"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:118
msgid "NetDB"
@@ -3150,7 +3174,7 @@ msgstr "NetzDB"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
msgid "Health Report"
-msgstr "Report"
+msgstr "Gesundheitszustand"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:124
msgid "Logs"
@@ -3158,7 +3182,7 @@ msgstr "Berichte"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:134
msgid "Graph router performance"
-msgstr "Graphische Darstellung der Routerperformance"
+msgstr "Graphische Darstellung der Routerleistung"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:136
msgid "Graphs"
@@ -3166,12 +3190,12 @@ msgstr "Graphen"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140
msgid "Textual router performance statistics"
-msgstr "Routerperformance-Statistiken in Textform"
+msgstr "Statistiken über die Leistung des Routers in Textform"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146
#: ../java/src/net/i2p/router/web/SummaryHelper.java:365
msgid "Local Destinations"
-msgstr "Lokale Ziele"
+msgstr "lokale Ziele"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:148
#: ../java/strings/Strings.java:62
@@ -3188,7 +3212,7 @@ msgstr "Grundsätzliches"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166
msgid "Local Identity"
-msgstr "Lokale Identität"
+msgstr "lokale Identität"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:170
msgid "Your unique I2P router identity is"
@@ -3196,15 +3220,15 @@ msgstr "Ihre eindeutige I2P-Routeridentifikation ist"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174
msgid "never reveal it to anyone"
-msgstr "verraten Sie sie niemanden!"
+msgstr "Verraten Sie sie niemandem!"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:176
msgid "show"
-msgstr "zeige"
+msgstr "anzeigen"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:187
msgid "How long we've been running for this session"
-msgstr "Wie lange ist der I2P Router aktiv seit letztem Neustart"
+msgstr "Wie lange ist der I2P-Router seit dem letztem Neustart aktiv"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
msgid "Uptime"
@@ -3212,43 +3236,43 @@ msgstr "Laufzeit"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197
msgid "Help with configuring your firewall and router for optimal I2P performance"
-msgstr "Hilfe bei der Konfiguration Ihrer Firewall und Router für eine optimale Leistung von I2P"
+msgstr "Hilfe bei der Konfiguration Ihrer Firewall und Ihres Routers für eine optimale Leistung."
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:226
msgid "Download"
-msgstr "Download"
+msgstr "Herunterladen"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235
msgid "Download Unsigned"
-msgstr "Unsigniertes Paket downloaden"
+msgstr "unsignierte Aktualisierung herunterladen"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261
msgid "Active"
-msgstr "Aktiv"
+msgstr "aktiv"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269
msgid "Fast"
-msgstr "Schnell"
+msgstr "schnell"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275
msgid "High capacity"
-msgstr "Hohe Kapazität"
+msgstr "hohe Kapazität"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:287
msgid "Known"
-msgstr "Bekannt"
+msgstr "bekannt"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:302
msgid "Help with firewall configuration"
-msgstr "Hilfe mit der Firewalleinstellung"
+msgstr "Hilfe bei der Firewalleinstellung"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304
msgid "Check NAT/firewall"
-msgstr "Kontrolliere NAT / Firewall"
+msgstr "Überprüfe NAT/Firewall!"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:324
msgid "Reseed"
-msgstr "Hole neue Kontaktinformationen"
+msgstr "Hole neue Teilnehmerinformationen"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:341
msgid "Configure router bandwidth allocation"
@@ -3256,15 +3280,15 @@ msgstr "Konfigurieren der Bandbreitenzuweisung des Routers"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:343
msgid "Bandwidth in/out"
-msgstr "Bandbreite ein- / ausgehend"
+msgstr "Bandbreite ein-/ausgehend"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:359
msgid "Total"
-msgstr "Total"
+msgstr "gesamt"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:366
msgid "Used"
-msgstr "Genutzt"
+msgstr "genutzt"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381
msgid "Exploratory"
@@ -3272,11 +3296,13 @@ msgstr "Erkundung"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393
msgid "Participating"
-msgstr "Partizipierend"
+msgstr "teilnehmend an"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399
msgid "Share ratio"
-msgstr "Verhältnis fremde/eigene Tunnel"
+msgstr ""
+"Verhältnis \n"
+" fremder/eigenen Hops"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:405
msgid "What's in the router's job queue?"
@@ -3284,32 +3310,32 @@ msgstr "Was ist in der Aufgabenliste des Routers?"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:407
msgid "Congestion"
-msgstr "Staumeldungen"
+msgstr "Rückstau"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412
msgid "Job lag"
-msgstr "Aufgabenverzug"
+msgstr "Aufgabenverzögerung"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418
msgid "Message delay"
-msgstr "Meldungsverzug"
+msgstr "Nachrichtenverzögerung"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:424
msgid "Tunnel lag"
-msgstr "Tunnelverzug"
+msgstr "Tunnelverzögerung"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:430
msgid "Backlog"
-msgstr "Rückstau"
+msgstr "Anfragenrückstau"
#: ../java/src/net/i2p/router/web/SummaryHelper.java:101
msgid "ERR-Client Manager I2CP Error - check logs"
-msgstr "FEHLER-Fehler des Klienten Managers von I2CP - siehe in den Berichten nach"
+msgstr "FEHLER: Fehler des Klienten-Managers von I2CP - Sieh in die Berichte!"
#: ../java/src/net/i2p/router/web/SummaryHelper.java:108
#, java-format
msgid "ERR-Clock Skew of {0}"
-msgstr "FEHLER-Uhrzeitdifferenz von {0}"
+msgstr "FEHLER: Uhrzeitdifferenz von {0}"
#: ../java/src/net/i2p/router/web/SummaryHelper.java:117
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:576
@@ -3330,7 +3356,7 @@ msgstr "WARNUNG: Eingehendes TCP aktiviert aber Firewall aktiv"
#: ../java/src/net/i2p/router/web/SummaryHelper.java:125
msgid "WARN-Firewalled and Floodfill"
-msgstr "WARNUNG: Firewall aktiv und FLoodfill aktiviert"
+msgstr "WARNUNG: Firewall aktiv und Floodfill aktiviert"
#: ../java/src/net/i2p/router/web/SummaryHelper.java:127
msgid "WARN-Firewalled and Fast"
@@ -3343,11 +3369,11 @@ msgstr "Firewall aktiv"
#: ../java/src/net/i2p/router/web/SummaryHelper.java:130
msgid "ERR-UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and restart"
-msgstr "FEHLER-UDP Port ist belegt - setze i2np.udp.internalPort=xxxx in der Konfiguration für Profis und starte I2P neu"
+msgstr "FEHLER: UDP Port ist belegt. Setze i2np.udp.internalPort=xxxx in der Konfiguration für Profis und starte I2P neu!"
#: ../java/src/net/i2p/router/web/SummaryHelper.java:136
msgid "ERR-No Active Peers, Check Network Connection and Firewall"
-msgstr "FEHLER - keine aktiven Teilnehmer, Überprüfen Sie die Firewall und Anbindung ans Netz"
+msgstr "FEHLER: Keine aktiven Teilnehmer. Überprüfen Sie Firewall und Netzwekrverbindung!"
#: ../java/src/net/i2p/router/web/SummaryHelper.java:139
msgid "ERR-UDP Disabled and Inbound TCP host/port not set"
@@ -3355,7 +3381,7 @@ msgstr "FEHLER: UDP deaktiviert und eingehender TCP/IP-Port nicht gesetzt"
#: ../java/src/net/i2p/router/web/SummaryHelper.java:141
msgid "WARN-Firewalled with UDP Disabled"
-msgstr "WARNUNG-Firewall aktiv und UDP deaktiviert"
+msgstr "WARNUNG: Firewall aktiv und UDP deaktiviert"
#: ../java/src/net/i2p/router/web/SummaryHelper.java:143
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:596
@@ -3364,7 +3390,7 @@ msgstr "Teste"
#: ../java/src/net/i2p/router/web/SummaryHelper.java:365
msgid "Add/remove/edit & control your client and server tunnels"
-msgstr "Klienten und Servertunnel hinzufügen, löschen, editieren oder kontrollieren"
+msgstr "Klienten- und Servertunnel hinzufügen, löschen oder bearbeiten"
#: ../java/src/net/i2p/router/web/SummaryHelper.java:377
msgid "Server"
@@ -3386,7 +3412,7 @@ msgstr "Baue wieder auf"
#: ../java/src/net/i2p/router/web/SummaryHelper.java:393
msgid "ago"
-msgstr "vorher"
+msgstr "vor"
#. green light
#: ../java/src/net/i2p/router/web/SummaryHelper.java:396
@@ -3413,13 +3439,13 @@ msgstr "keine"
#: ../java/src/net/i2p/router/web/SummaryHelper.java:416
#: ../java/strings/Strings.java:36
msgid "shared clients"
-msgstr "gemeinsam benutzt"
+msgstr "versch. Klienten"
#. Note to translators: all runtime zh translation disabled in this file, no font available in RRD
#: ../java/src/net/i2p/router/web/SummaryRenderer.java:84
#, java-format
msgid "events in {0}"
-msgstr "Events in {0}"
+msgstr "Ereignisse in {0}"
#: ../java/src/net/i2p/router/web/SummaryRenderer.java:86
#, java-format
@@ -3446,31 +3472,31 @@ msgstr "ändern"
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:65
msgid "dead"
-msgstr "gestorben"
+msgstr "tot"
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71
msgid "Participating tunnels"
-msgstr "Teilnehmende Tunnel"
+msgstr "Fremde Tunnel, an denen Sie teilnehmen"
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
msgid "From"
-msgstr "Woher"
+msgstr "Von"
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72
msgid "Receive on"
-msgstr "Empfangen von"
+msgstr "Empfangen auf"
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
msgid "Expiration"
-msgstr "Zeitspanne"
+msgstr "Zeit bis Ablauf"
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
msgid "Send on"
-msgstr "Gesendet an"
+msgstr "Gesendet auf"
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73
msgid "To"
-msgstr "Zu"
+msgstr "An"
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:74
msgid "Rate"
@@ -3504,12 +3530,12 @@ msgstr "Teilnehmer"
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:126
msgid "Inactive participating tunnels"
-msgstr "Inaktive teilnehmende Tunnel"
+msgstr "Inaktive Tunnel, an denen Sie teilnehmen"
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:127
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:218
msgid "Lifetime bandwidth usage"
-msgstr "Verbrauchte Bandbreite über die aktive Zeit"
+msgstr "Genutzte Bandbreite über die Lebensdauer"
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:156
msgid "Expiry"
@@ -3526,7 +3552,7 @@ msgstr "Endpunkt"
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:205
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:212
msgid "Build in progress"
-msgstr "Aufbau in Bearbeitung"
+msgstr "Im Aufbau befindlich"
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:205
msgid "inbound"
@@ -3538,19 +3564,19 @@ msgstr "ausgehend"
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:217
msgid "No tunnels; waiting for the grace period to end."
-msgstr "Keine Tunnel; warte bie die Gnadenfrist abgelaufen ist"
+msgstr "Keine Tunnel; warte bis die Gnadenfrist abgelaufen ist"
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:219
msgid "in"
-msgstr "ein"
+msgstr "eingehend"
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:220
msgid "out"
-msgstr "aus"
+msgstr "ausgehend"
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:237
msgid "Tunnel Counts By Peer"
-msgstr "Anzahl der Tunnel nach Kontakten"
+msgstr "Anzahl der Tunnel nach Teilnehmern"
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:238
msgid "% of total"
@@ -3558,15 +3584,15 @@ msgstr "% von allen"
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:238
msgid "Our Tunnels"
-msgstr "Unsere Tunnels"
+msgstr "Unsere Tunnel"
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:238
msgid "Participating Tunnels"
-msgstr "Teilnehmende Tunnel"
+msgstr "Fremde Tunnel"
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:256
msgid "Totals"
-msgstr "Total"
+msgstr "Gesamt"
#: ../java/src/net/i2p/router/web/UnsignedUpdateHandler.java:66
#: ../java/src/net/i2p/router/web/UpdateHandler.java:132
@@ -3581,27 +3607,27 @@ msgstr "Aktualisiere"
#: ../java/src/net/i2p/router/web/UpdateHandler.java:183
#: ../java/src/net/i2p/router/web/UpdateHandler.java:208
msgid "Update downloaded"
-msgstr "Update heruntergeladen"
+msgstr "Aktualisierung heruntergeladen"
#: ../java/src/net/i2p/router/web/UnsignedUpdateHandler.java:91
#, java-format
msgid "Unsigned update file from {0} is corrupt"
-msgstr "Unsignierte Update Datei von {0} ist korrupt"
+msgstr "Unsignierte Aktualisierungsdatei von {0} ist fehlerhaft"
#: ../java/src/net/i2p/router/web/UnsignedUpdateHandler.java:111
#: ../java/src/net/i2p/router/web/UpdateHandler.java:203
msgid "Restarting"
-msgstr "starte neu"
+msgstr "Starte neu"
#: ../java/src/net/i2p/router/web/UnsignedUpdateHandler.java:118
#: ../java/src/net/i2p/router/web/UpdateHandler.java:210
msgid "Click Restart to install"
-msgstr "Klicken Sie auf Neustart zum Installieren"
+msgstr "Klicken Sie auf Neustart zum Installieren der"
#: ../java/src/net/i2p/router/web/UnsignedUpdateHandler.java:120
#: ../java/src/net/i2p/router/web/UpdateHandler.java:212
msgid "Click Shutdown and restart to install"
-msgstr "Klicken Sie auf Herunterfahren und Neustarten zum Installieren"
+msgstr "Klicken Sie zum Installieren auf Herunterfahren und Neustarten"
#: ../java/src/net/i2p/router/web/UnsignedUpdateHandler.java:121
#: ../java/src/net/i2p/router/web/UpdateHandler.java:214
@@ -3616,7 +3642,7 @@ msgstr "Kopieren nach {0} fehlgeschlagen"
#: ../java/src/net/i2p/router/web/UpdateHandler.java:203
msgid "Update verified"
-msgstr "Update verifiziert"
+msgstr "Aktualisierung verifiziert"
#: ../java/src/net/i2p/router/web/UpdateHandler.java:228
msgid "Transfer failed"
@@ -3656,11 +3682,11 @@ msgstr "Webkonsole"
#: ../java/strings/Strings.java:23
msgid "SAM application bridge"
-msgstr "SAM Anwendungsanbindung"
+msgstr "SAM-Anwendungsanbindung"
#: ../java/strings/Strings.java:24
msgid "Application tunnels"
-msgstr "Applikationstunnel"
+msgstr "Anwendungstunnel"
#: ../java/strings/Strings.java:25
msgid "My eepsite web server"
@@ -3668,7 +3694,7 @@ msgstr "Webserver meiner Eepseite"
#: ../java/strings/Strings.java:26
msgid "I2P webserver (eepsite)"
-msgstr "I2P Webserver (eepsite)"
+msgstr "I2P-Webserver (eepsite)"
#: ../java/strings/Strings.java:27
msgid "Browser launch at startup"
@@ -3676,15 +3702,15 @@ msgstr "Starte den Browser beim Starten"
#: ../java/strings/Strings.java:28
msgid "BOB application bridge"
-msgstr "BOB Anwendungsanbindung"
+msgstr "BOB-Anwendungsanbindung"
#: ../java/strings/Strings.java:30
msgid "Open Router Console in web browser at startup"
-msgstr "Zeige die Routerkonsole im Webbrowser beim Starten"
+msgstr "nach dem Starten die Routerkonsole im Browser anzeigen"
#: ../java/strings/Strings.java:37
msgid "IRC proxy"
-msgstr "IRC Brücke"
+msgstr "IRC-Brücke"
#: ../java/strings/Strings.java:38
msgid "eepsite"
@@ -3692,11 +3718,11 @@ msgstr "Eepseite"
#: ../java/strings/Strings.java:39
msgid "I2P webserver"
-msgstr "I2P Webserver"
+msgstr "I2P-Webserver"
#: ../java/strings/Strings.java:40
msgid "HTTP Proxy"
-msgstr "HTTP Brücke"
+msgstr "HTTP-Brücke"
#. older names for pre-0.7.4 installs
#: ../java/strings/Strings.java:42
@@ -3728,7 +3754,7 @@ msgstr "dunkel"
#: ../java/strings/Strings.java:53
msgid "light"
-msgstr "Licht"
+msgstr "hell"
#: ../java/strings/Strings.java:54
msgid "midnight"
@@ -3741,11 +3767,11 @@ msgstr "Bandbreite"
#: ../java/strings/Strings.java:58
msgid "BandwidthLimiter"
-msgstr "Bandbreitenlimitierer"
+msgstr "Bandbreitenbegrenzer"
#: ../java/strings/Strings.java:59
msgid "ClientMessages"
-msgstr "Klienten Nachrichten"
+msgstr "Klienten-Nachrichten"
#: ../java/strings/Strings.java:60
msgid "Encryption"
@@ -3888,6 +3914,7 @@ msgstr "Netzwerkeinstellungen"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:220
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:228
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:220
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:220
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:220
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/index_jsp.java:223
@@ -3919,6 +3946,7 @@ msgstr "Auffrischen {s}"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:224
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:232
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:224
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:224
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:224
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/index_jsp.java:227
@@ -3937,25 +3965,25 @@ msgstr "Aktiviere"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:241
msgid "I2P Network Configuration"
-msgstr "I2P Netzwerkeinstellungen"
+msgstr "I2P-Netzwerkeinstellungen"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:297
msgid "Bandwidth limiter"
-msgstr "Bandbreitenlimitierer"
+msgstr "Bandbreitenbegrenzer"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:299
msgid "I2P will work best if you configure your rates to match the speed of your internet connection."
msgstr ""
-"I2P wird am besten funktionieren, wenn Sie die Werte so konfigurieren, \n"
+"I2P funktioniert am besten, wenn Sie die Werte so konfigurieren, \n"
"dass die Geschwindigkeit zu Ihrer Internetverbindung passt."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:303
msgid "KBps In"
-msgstr "kbyte/s Eingehend"
+msgstr "kByte/s eingehend"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:317
msgid "KBps Out"
-msgstr "kbyte/s Ausgehend"
+msgstr "kByte/s ausgehend"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:333
msgid "Share"
@@ -3970,41 +3998,41 @@ msgstr "HINWEIS"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:342
#, java-format
msgid "You have configured I2P to share only {0} KBps."
-msgstr "Sie haben I2P angewisen nur {0} kbit/s mit anderen zu teilen."
+msgstr "Sie haben I2P angewiesen, nur {0} kbit/s mit anderen zu teilen."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:345
msgid "I2P requires at least 12KBps to enable sharing. "
-msgstr "I2P benötigt mindestens 12 kbit/s um den Austausch zu ermöglichen. "
+msgstr "I2P benötigt mindestens 12 kbit/s, um das Durchleiten zu ermöglichen. "
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:346
msgid "Please enable sharing (participating in tunnels) by configuring more bandwidth. "
msgstr ""
-"Bitte aktivieren Sie die gemeinsame Nutzung (Teilnahme am Tunneln),\n"
+"Bitte aktivieren Sie die gemeinsame Nutzung (Teilnahme an Tunneln),\n"
"indem Sie mehr Bandbreite freigeben. "
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:347
msgid "It improves your anonymity by creating cover traffic, and helps the network."
msgstr ""
-"Es verbessert Ihre Anonymität durch herstellen von s. g. Rauschen und \n"
+"Es verbessert Ihre Anonymität durch Herstellen von s. g. Rauschen und \n"
"es hilft zudem dem Netzwerk."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:350
#, java-format
msgid "You have configured I2P to share {0} KBps."
-msgstr "Sie haben I2P konfiguriert {0} kbit/s zu teilen. "
+msgstr "Sie haben I2P konfiguriert, {0} kbit/s durchzuleiten. "
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:353
msgid "The higher the share bandwidth the more you improve your anonymity and help the network."
msgstr ""
-"Je höher der Anteil an geteilter Bandbreite ist, desto mehr wird \n"
-"Ihre Anonymität verbessert und es hilft dem Netz. "
+"Je höher der Anteil an geteilter Bandbreite ist, desto mehr verbessert sich \n"
+"Ihre Anonymität, und darüber hinaus hilft es dem Netz. "
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:357
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:513
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:303
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:326
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:320
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:337
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:373
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:341
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:321
@@ -4014,11 +4042,11 @@ msgstr "Abbruch"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:374
msgid "IP and Transport Configuration"
-msgstr "IP und Transport Einstellungen"
+msgstr "IP- und Transport-Einstellungen"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:376
msgid "The default settings will work for most people."
-msgstr "Die Standardeinstellungen werden für die meisten Anwender funktionieren."
+msgstr "Die Standardeinstellungen funktionieren für die meisten Anwender."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:378
msgid "There is help below."
@@ -4030,7 +4058,7 @@ msgstr "UPnP-Einstellungen"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:384
msgid "Enable UPnP to open firewall ports"
-msgstr "Aktiviere UPnP um Ports in der Firewall freizuschalten"
+msgstr "Aktiviere UPnP, um Ports in der Firewall freizuschalten"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:386
msgid "UPnP status"
@@ -4047,7 +4075,7 @@ msgstr "Extern erreichbarer Hostname oder IP-Adresse"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:394
msgid "Use all auto-detect methods"
-msgstr "Alle automatischen erkannten Modi benutzen"
+msgstr "Alle automatisch erkannten Modi benutzen"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:398
msgid "Disable UPnP IP address detection"
@@ -4068,27 +4096,27 @@ msgstr "Hostnamen oder IP angeben"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:416
msgid "Select Interface"
-msgstr "Schnittstelle ausählen"
+msgstr "Schnittstelle auswählen"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:430
msgid "Hidden mode - do not publish IP"
-msgstr "Versteckter Modus - publiziert die IP-Adresse nicht"
+msgstr "Versteckter Modus - veröffentlicht die IP-Adresse nicht"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:432
msgid "(prevents participating traffic)"
-msgstr "(verhindert Bandbreite durch teilnehmende Tunnel)"
+msgstr "(verhindert die Teilnahme an fremden Tunneln)"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:434
msgid "Action when IP changes"
-msgstr "Aktion wenn die IP-Adresse sich ändert"
+msgstr "Aktion wenn sich die IP-Adresse ändert"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:438
msgid "Laptop mode - Change router identity and UDP port when IP changes for enhanced anonymity"
-msgstr "Laptop Modus - Ändert zur erhöhten Anonymität ihre Router Identifikation und den UDP Port wenn sich ihre IP ändert"
+msgstr "Laptop Modus - ändert zur Erhöhung der Anonymität Ihre Router-Identifikation und den UDP-Port, wenn sich Ihre IP ändert"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:440
msgid "Experimental"
-msgstr "Experimentell"
+msgstr "experimentell"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:442
msgid "UDP Configuration:"
@@ -4130,8 +4158,8 @@ msgstr "Komplett deaktivieren"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:490
msgid "(select only if behind a firewall that throttles or blocks outbound TCP)"
msgstr ""
-"(nur auswählen wenn dieser Router hinter einer Firewall ist, die ausgehenden \n"
-"TCP-Verkehr sperrt oder limitiert)"
+"(nur auswählen, wenn dieser Router hinter einer Firewall ist, die ausgehenden \n"
+"TCP-Verkehr blokiertt oder begrenzt)"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:492
msgid "Externally reachable TCP port"
@@ -4139,11 +4167,11 @@ msgstr "Extern erreichbarer TCP-Port"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:496
msgid "Use the same port configured for UDP"
-msgstr "Den selben Port wie für UDP eingestellt benutzen"
+msgstr "Den selben Port wie für UDP benutzen"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:504
msgid "Specify Port"
-msgstr "Gebe den Port an"
+msgstr "Gib den Port an"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:508
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:338
@@ -4162,7 +4190,7 @@ msgstr "Konfigurationshilfe"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:519
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:568
msgid "While I2P will work fine behind most firewalls, your speeds and network integration will generally improve if the I2P port is forwarded for both UDP and TCP."
-msgstr "I2P wird auch hinter den meisten Firewalls funktionieren, aber die Geschwindigkeit und Integration ins I2P-Netz werden sich erhöhen, wenn der I2P-Port für TCP und UDP in der Firewall freigegeben und auf Ihrem Computer weitergeleitet wird."
+msgstr "I2P funktioniert auch hinter den meisten Firewalls, aber die Geschwindigkeit und Integration ins I2P-Netz erhöhen sich, wenn der I2P-Port in der Firewall für TCP und UDP freigegeben und auf Ihren Computer weitergeleitet wird."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:521
msgid "If you can, please poke a hole in your firewall to allow unsolicited UDP and TCP packets to reach you."
@@ -4179,7 +4207,7 @@ msgstr ""
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:525
msgid "Most of the options above are for special situations, for example where UPnP does not work correctly, or a firewall not under your control is doing harm."
msgstr ""
-"Die meisten der oben stehenden Optionen sind für besondere Situationen,\n"
+"Die meisten der obenstehenden Optionen sind für besondere Situationen,\n"
"wenn z. B. UPnP nicht funktioniert oder die Firewall nicht geändert werden \n"
"kann und Probleme bereitet."
@@ -4192,7 +4220,7 @@ msgstr ""
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:536
msgid "UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect the external IP address and forward ports."
msgstr ""
-"UPnP kommuniziert normalerweise mit den Internet Gateway Devices (IGDs) um \n"
+"UPnP kommuniziert normalerweise mit den Internet Gateway Devices (IGDs), um \n"
"die extern erreichbare IP-Adresse zu ermitteln und die Ports weiterzuleiten."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:538
@@ -4223,7 +4251,7 @@ msgstr "Mehrere Firewalls / Router in der Verbindung zum Internet"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:550
msgid "UPnP device change, reset, or address change"
-msgstr "UPnP-Gerät ändert sich, wird neu gestartet oder ändert seine Adresse"
+msgstr "UPnP-Gerät geändert, neugestartet oder mit geänderter Adresse"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:552
msgid "Review the UPnP status here."
@@ -4246,15 +4274,14 @@ msgstr "Sie sind <b>nicht geheim</b>."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:560
msgid "Also, <b>do not enter a private IP address</b> like 127.0.0.1 or 192.168.1.1."
msgstr ""
-"Geben Sie auch <b>keine IP-Adresse ür den privaten Gebrauch</b> wie\n"
-"127.0.0.1 oder 192.168.1.1 an."
+"Geben Sie auch <b>keine IP-Adresse für den privaten Gebrauch</b> wie\n"
+"127.0.0.1 oder 192.168.1.1 an!"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:562
msgid "If you specify the wrong IP address or hostname, or do not properly configure your NAT or firewall, your network performance will degrade substantially."
msgstr ""
-"Wenn Sie eine falsche IP-Adresse oder Hostnamen angeben, oder Sie \n"
-"Ihre Firewall oder NAT nicht richtig konfigurieren, wird sich Ihre \n"
-"Netzwerk-Performance erheblich verschlechtern."
+"Wenn Sie eine falsche IP-Adresse oder einen falschen Hostnamen angeben, oder Ihre Firewall oder NAT nicht richtig konfigurieren, \n"
+"wird sich Ihre Netzwerk-Performance erheblich verschlechtern."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:564
msgid "When in doubt, leave the settings at the defaults."
@@ -4267,14 +4294,14 @@ msgstr "Hilfe zur Erreichbarkeit"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:571
msgid "If you think you have opened up your firewall and I2P still thinks you are firewalled, remember that you may have multiple firewalls, for example both software packages and external hardware routers."
msgstr ""
-"Wenn Sie meinen Sie haben Ihre Firewall göffnet und I2P dennoch glaubt, es wäre\n"
+"Wenn Sie meinen, Sie haben Ihre Firewall geöffnet und I2P breichtet dennoch, es wäre\n"
"hinter einer Firewall, dann prüfen Sie, ob Sie möglicherweise mehrere Firewalls\n"
-"- zum Beispiel sowohl Software wie auch externer Hardware-Router - haben."
+"- zum Beispiel sowohl Software- als auch externer Hardware-Router - haben."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:574
msgid "If there is an error, the <a href=\"logs.jsp\">logs</a> may also help diagnose the problem."
msgstr ""
-"Wenn ein Fehler auftritt, können die <a href=\"logs.jsp\">Protokolle</a> helfen, \n"
+"Wenn ein Fehler auftritt, können die <a href=\"logs.jsp\">Berichte</a> helfen, \n"
"das Problem zu diagnostizieren."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:578
@@ -4288,13 +4315,13 @@ msgstr "Ihr UDP-Port wird anscheinend von der Firewall geblockt."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:584
msgid "As the firewall detection methods are not 100% reliable, this may occasionally be displayed in error."
msgstr ""
-"Da die Firewall Nachweismethoden nicht 100% zuverlässig sind, ist die \n"
-"Anzeige gelegentlich Fehlerhaft."
+"Da die Firewall-Nachweismethoden nicht zu 100% zuverlässig sind, ist die \n"
+"Anzeige gelegentlich fehlerhaft."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:586
msgid "However, if it appears consistently, you should check whether both your external and internal firewalls are open for your port."
msgstr ""
-"Wenn es allerdings übereinstimmt sollten Sie überprüfen, ob Ihre Ports,\n"
+"Wenn es allerdings dauerhaft angezeigt wird, sollten Sie überprüfen, ob Ihre Ports,\n"
"sowohl der externen wie auch der internen Firewall, geöffnet sind."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:588
@@ -4302,23 +4329,23 @@ msgid "I2P will work fine when firewalled, there is no reason for concern. When
msgstr ""
"I2P wird auch mit geschlossener Firewall gut funktionieren, es besteht kein \n"
"Grund zur Besorgnis. Bei geschlossener Firewall verwendet der Router \n"
-"\"introducers\" um eingehende Verbindungen zu übertragen."
+"\"Hilfsrouter\", um eingehende Verbindungen zu übertragen."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:590
msgid "However, you will get more participating traffic and help the network more if you can open your firewall(s)."
-msgstr "Falls Sie ihre Firewall(s) öffnen helfen Sie dem Netzwerk mehr und bekommen auch mehr teilnehmende Bandbreite."
+msgstr "Falls Sie Ihre Firewall(s) öffnen, helfen Sie dem Netzwerk mehr und gleichzeitig erhöhen Sie Ihre Anonymität durch die Teilnahme an fremden Tunneln."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:592
msgid "If you think you have already done so, remember that you may have both a hardware and a software firewall, or be behind an additional, institutional firewall you cannot control."
-msgstr "Falls Sie dieses schon getan haben, denken Sie bitte daran, das Sie eine Hardware und eine Software Firewall haben können oder aber hinter einer Firewall sind, die Sie nicht ändern können (z.B. Provider)."
+msgstr "Falls Sie dies schon getan haben, denken Sie bitte daran, dass Sie eine Hardware- und eine Software-Firewall haben könnten, oder aber hinter einer Firewall sind, die Sie nicht ändern können (z.B. seitens Ihres Providers)."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:594
msgid "Also, some routers cannot correctly forward both TCP and UDP on a single port, or may have other limitations or bugs that prevent them from passing traffic through to I2P."
-msgstr "Auch können manche Router nicht den selben Port auf TCP und UDP korrekt weiterleiten, oder haben andere Limitierungen und Fehler, die die Port Weiterleitung an I2P behindern."
+msgstr "Auch können manche Router nicht TCP und UDP korrekt auf dem selben Port weiterleiten, oder haben andere Beschränkungen oder Fehler, die die Portweiterleitung an den I2P-Router behindern."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:598
msgid "The router is currently testing whether your UDP port is firewalled."
-msgstr "Der Router testet gerade ob Ihr UDP Port offen ist."
+msgstr "Der Router testet gerade, ob Ihr UDP-Port offen ist."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:602
msgid "The router is not configured to publish its address, therefore it does not expect incoming connections."
@@ -4326,39 +4353,39 @@ msgstr "Die Einstellungen des Routers verhindern die Veröffentlichung der Adres
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:604
msgid "WARN - Firewalled and Fast"
-msgstr "WARNUNG - Firewall aktiv und Schnell"
+msgstr "WARNUNG: Firewall aktiv und schnell"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:606
msgid "You have configured I2P to share more than 128KBps of bandwidth, but you are firewalled."
-msgstr "Sie haben I2P angewiesen, mehr als 128 kbit/s Bandbreite zu teilen, aber Sie sind hinter einer Firewall."
+msgstr "Sie haben I2P angewiesen, mehr als 128 kbit/s Bandbreite zu teilen, aber leider sind Sie hinter einer Firewall."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:608
msgid "While I2P will work fine in this configuration, if you really have over 128KBps of bandwidth to share, it will be much more helpful to the network if you open your firewall."
-msgstr "I2P arbeitet korrekt in dieser Einstellung; falls Sie jedoch wirklich über 128 kbit/s Bandbreite zum teilen haben, ist es mit einer offenen Firewall viel hilfreicher für das Netzwerk."
+msgstr "I2P funktioniert zwar auch mit dieser Einstellung, falls Sie jedoch wirklich über mehr als 128 kbit/s Bandbreite zum Teilen verfügen, sind Sie mit einer offenen Firewall viel hilfreicher für das Netzwerk."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:610
msgid "WARN - Firewalled and Floodfill"
-msgstr "WARNUNG - Firewall und Floodfillfunktion aktiv"
+msgstr "WARNUNG: Firewall und Floodfillfunktion aktiv"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:612
msgid "You have configured I2P to be a floodfill router, but you are firewalled."
-msgstr "Sie haben I2P als Floodfill Router eingerichtet, jedoch sind sie hinter einer Firewall."
+msgstr "Sie haben I2P als Floodfill-Router eingerichtet, jedoch sind sie hinter einer Firewall."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:614
msgid "For best participation as a floodfill router, you should open your firewall."
-msgstr "Für die beste Teilnahme als Floodfill-Router, sollten Sie Ihre Firewall zu öffnen."
+msgstr "Für die beste Teilnahme als Floodfill-Router, sollten Sie Ihre Firewall öffnen."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:616
msgid "WARN - Firewalled with Inbound TCP Enabled"
-msgstr "WARNUNG: von der Firewall geblockt und ankommendes TCP aktiviert"
+msgstr "WARNUNG: von Firewall geblockt und ankommendes TCP aktiviert"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:618
msgid "You have configured inbound TCP, however your UDP port is firewalled, and therefore it is likely that your TCP port is firewalled as well."
-msgstr "Sie haben eingehendes TCP konfiguriert, jedoch ist ihr UDP Port hinter einer Firewall. Deswegen ist es wahrscheinlich, das Ihr TCP Port auch hinter einer Firewall ist."
+msgstr "Sie haben eingehendes TCP konfiguriert, jedoch ist ihr UDP-Port hinter einer Firewall. Deswegen ist es wahrscheinlich, dass Ihr TCP-Port auch hinter einer Firewall ist."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:620
msgid "If your TCP port is firewalled with inbound TCP enabled, routers will not be able to contact you via TCP, which will hurt the network."
-msgstr "Falls ihr TCP Port gesperrt ist und sie \"eingehendes TCP\" aktiviert haben, werden andere Router Sie nicht via TCP erreichen können, dieses schadet dem Netzwerk."
+msgstr "Falls Ihr TCP Port gesperrt ist und Sie \"eingehendes TCP\" aktiviert haben, werden andere Router Sie nicht via TCP erreichen können. Dies schadet dem Netzwerk."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:622
msgid "Please open your firewall or disable inbound TCP above."
@@ -4366,7 +4393,7 @@ msgstr "Bitte öffnen Sie Ihre Firewall oder schalten Sie ankommendes TCP oben a
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:624
msgid "WARN - Firewalled with UDP Disabled"
-msgstr "WARNUNG - Firewall aktiv und UDP deaktiviert"
+msgstr "WARNUNG: Firewall aktiv und UDP deaktiviert"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:626
msgid "You have configured inbound TCP, however you have disabled UDP."
@@ -4378,23 +4405,23 @@ msgstr "Sie scheinen auf TCP eine Firewall zu haben, deswegen kann Ihr Router ke
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:630
msgid "Please open your firewall or enable UDP."
-msgstr "Bitte öffnen Sie ihre Firewall oder aktivieren Sie UDP."
+msgstr "Bitte öffnen Sie Ihre Firewall oder aktivieren Sie UDP!"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:632
msgid "ERR - Clock Skew"
-msgstr "FEHLER - Uhr nicht synchron"
+msgstr "FEHLER: Uhr nicht synchron"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:634
msgid "Your system's clock is skewed, which will make it difficult to participate in the network."
-msgstr "Ihre Uhrzeit ist nicht synchron mit dem Netzwerk, dieses macht es schwierig im Netzwerk teilzunehmen."
+msgstr "Ihre Uhrzeit ist nicht synchron mit dem Netzwerk, dies macht es schwierig, am Netzwerk teilzunehmen."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:636
msgid "Correct your clock setting if this error persists."
-msgstr "Korrigieren Sie ihre Uhrzeit falls dieser Fehler bestehen bleibt."
+msgstr "Korrigieren Sie Ihre Uhrzeit falls dieser Fehler bestehen bleibt!"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:638
msgid "ERR - Private TCP Address"
-msgstr "FEHLER - Private TCP Adresse"
+msgstr "FEHLER: Private TCP-Adresse"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:640
msgid "You must never advertise an unroutable IP address such as 127.0.0.1 or 192.168.1.1 as your external address."
@@ -4402,23 +4429,23 @@ msgstr "Sie dürfen nie eine nicht routebare IP wie 127.0.0.1 oder 192.168.1.1 a
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:642
msgid "Correct the address or disable inbound TCP above."
-msgstr "Korrigieren Sie die Adresse oder deaktivieren Sie oben eingehendes TCP."
+msgstr "Korrigieren Sie die Adresse oder deaktivieren Sie eingehendes TCP oben!"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:644
msgid "ERR - SymmetricNAT"
-msgstr "FEHLER - Symmetrisches NAT"
+msgstr "FEHLER: symmetrische NAT"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:646
msgid "I2P detected that you are firewalled by a Symmetric NAT."
-msgstr "I2P hat erkannt das Sie hinter einem symmetrischen NAT gesperrt sind."
+msgstr "I2P hat erkannt, dass Sie hinter einer symmetrischen NAT gesperrt sind."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:648
msgid "I2P does not work well behind this type of firewall. You will probably not be able to accept inbound connections, which will limit your participation in the network."
-msgstr "I2P arbeitet nicht gut hinter diesem Typ einer Firewall. Sie können wahrscheinlich keine eingehenden Verbindungen akzeptieren, welches ihre Partizipierung im Netzwerk limitiert."
+msgstr "I2P funktioniert hinter diesem Typ Firewall nicht gut. Sie können wahrscheinlich keine eingehenden Verbindungen akzeptieren, was Ihre Teilnahme am Netzwerk beeinträchtigt."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:650
msgid "ERR - UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and restart"
-msgstr "FEHLER - UDP Port wird schon benutzt - setzen Sie i2np.udp.internalPort=xxxx in den erweiterten Einstellungen und starten Sie neu"
+msgstr "FEHLER: UDP-Port wird schon benutzt. Setzen Sie i2np.udp.internalPort=xxxx in den erweiterten Einstellungen und starten Sie neu!"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:652
msgid "I2P was unable to bind to port 8887 or other configured port."
@@ -4426,23 +4453,23 @@ msgstr "I2P konnte sich nicht auf den konfigurierten Port binden."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:654
msgid "Check to see if another program is using the configured port. If so, stop that program or configure I2P to use a different port."
-msgstr "Kontrollieren Sie ob ein anderes Programm den eingestellten Port benutzt. Falls ja, beenden Sie dieses Programm oder wählen Sie einen anderen Port für I2P."
+msgstr "Überprüfen Sie, ob ein anderes Programm den eingestellten Port benutzt. Falls ja, beenden Sie dieses Programm oder wählen Sie einen anderen Port für I2P!"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:656
msgid "This may be a transient error, if the other program is no longer using the port."
-msgstr "Dieses kann ein flüchtiger Fehler sein - falls das andere Programm diesen Port nicht mehr nutzt."
+msgstr "Dies kann ein vorübergehender Fehler sein, falls das andere Programm diesen Port nicht mehr nutzt."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:658
msgid "However, a restart is always required after this error."
-msgstr "Jedenfalls wird nach diesem Fehler immer ein Neustart benötigt."
+msgstr "Jedoch ist nach diesem Fehler immer ein Neustart erforderlich."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:660
msgid "ERR - UDP Disabled and Inbound TCP host/port not set"
-msgstr "FEHLER - UDP deaktiviert und eingehende TCP Adresse/Port nicht konfiguriert"
+msgstr "FEHLER: UDP deaktiviert und eingehende TCP-Adresse/Port nicht konfiguriert"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:662
msgid "You have not configured inbound TCP with a hostname and port above, however you have disabled UDP."
-msgstr "Sie haben unter TCP eingehend keinen Hostnamen und Port eingetragen und dazu UDP deaktiviert."
+msgstr "Sie haben unter TCP eingehend keinen Hostnamen und Port eingetragen und dennoch UDP deaktiviert."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:664
msgid "Therefore your router cannot accept inbound connections."
@@ -4450,19 +4477,19 @@ msgstr "Somit kann Ihr Router keine eigehenden Verbindungen akzeptieren."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:666
msgid "Please configure a TCP host and port above or enable UDP."
-msgstr "Bitte konfigurieren Sie eine TCP Adresse und Port im oberen Bereich oder aktivieren Sie UDP."
+msgstr "Bitte konfigurieren Sie eine Adresse und einen Port im oberen Bereich für TCP oder aktivieren Sie UDP!"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:668
msgid "ERR - Client Manager I2CP Error - check logs"
-msgstr "FEHLER - Klientenmanager I2CP Fehler - schauen Sie in die Berichte"
+msgstr "FEHLER: Klientenmanager I2CP Fehler - Schauen Sie in die Berichte!"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:670
msgid "This is usually due to a port 7654 conflict. Check the logs to verify."
-msgstr "Dieses geschieht für gewöhnlich wegen eines Konfliktes auf Port 7654. Prüfen Sie die Berichte um dies zu verifizieren."
+msgstr "Dies geschieht für gewöhnlich wegen eines Konflikts auf Port 7654. Prüfen Sie die Berichte, um dies zu verifizieren!"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:672
msgid "Do you have another I2P instance running? Stop the conflicting program and restart I2P."
-msgstr "Haben Sie eine zweite I2P Instanz am laufen? Beenden Sie das störende Programm und starten Sie I2P neu."
+msgstr "Haben Sie eine zweite I2P-Instanz laufen? Beenden Sie das störende Programm und starten Sie I2P neu!"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:107
msgid "config advanced"
@@ -4470,15 +4497,15 @@ msgstr "Erweiterte Einstellungen"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:242
msgid "I2P Advanced Configuration"
-msgstr "I2P Erweiterte Einstellungen"
+msgstr "I2P - Erweiterte Einstellungen"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:299
msgid "Advanced I2P Configuration"
-msgstr "Erweiterte I2P Einstellungen"
+msgstr "Erweiterte I2P-Einstellungen"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:309
msgid "Some changes may require a restart to take effect."
-msgstr "Einige Einstellungen benötigen einen Router Neustart um aktiv zu werden."
+msgstr "Einige Einstellungen benötigen einen Routerneustart, um aktiv zu werden."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:106
msgid "config clients"
@@ -4486,11 +4513,11 @@ msgstr "Klienten einrichten"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:244
msgid "I2P Client Configuration"
-msgstr "I2P Klient Konfiguration"
+msgstr "Konfiguration der I2P-Klienten"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:311
msgid "Client Configuration"
-msgstr "Klient Konfiguration"
+msgstr "Klient-Konfiguration"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:313
msgid "The Java clients listed below are started by the router and run in the same JVM."
@@ -4500,64 +4527,64 @@ msgstr ""
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:317
msgid "To change other client options, edit the file"
-msgstr "Ändern Sie die Datei um andere Klienten Optionen zu ändern"
+msgstr "Bearbeiten Sie diese Datei, um andere Klienten-Optionen zu ändern:"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:324
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:344
msgid "All changes require restart to take effect."
-msgstr "Alle Änderungen benötigen einen Neustart um aktiv zu werden."
+msgstr "Alle Änderungen erfordern einen Neustart, um aktiv zu werden."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:336
msgid "WebApp Configuration"
-msgstr "WebApp Einstellungen"
+msgstr "WebApp-Einstellungen"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:338
msgid "The Java web applications listed below are started by the webConsole client and run in the same JVM as the router. They are usually web applications accessible through the router console. They may be complete applications (e.g. i2psnark),front-ends to another client or application which must be separately enabled (e.g. susidns, i2ptunnel), or have no web interface at all (e.g. addressbook)."
-msgstr "Unten genannte Java Anwendungen werden vom Web Konsolen Klienten gestartet und laufen in der selben JVM wie der Router. Dieses sind normalerweise Web Anwendungen die über die Router Konsole erreichbar sind. Es können komplette Anwendungen (z.B. i2psnark), reine Oberflächen für andere Klienten, Anwendungen, die separat aktiviert werden müssen (z.B. susidns,i2ptunnel), oder Anwendungen ohne Oberfläche (Adressbuch) sein."
+msgstr "Untengenannte Java-Anwendungen werden vom WebKonsolen-Klienten gestartet und laufen in der selben JVM wie der Router. Es handelt sich dabei normalerweise Web-Anwendungen, die über die Routerkonsole erreichbar sind. Es können komplette Anwendungen (z.B. i2psnark), reine Oberflächen für andere Klienten, Anwendungen, die separat aktiviert werden müssen (z.B. susidns, i2ptunnel), oder Anwendungen ohne Oberfläche (Adressbuch) sein."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:340
msgid "A web app may also be disabled by removing the .war file from the webapps directory; however the .war file and web app will reappear when you update your router to a newer version, so disabling the web app here is the preferred method."
-msgstr "Einw Webanwendung kann auch durch das Entfernen der .war Datei deaktiviert werden. Jedoch wird die .war Datei und die Anwendung nach einem Update auf eine neue I2P Version wieder erscheinen. Somit ist das Deaktivieren der Web Anwendung hier die bevorzugte Methode."
+msgstr "Eine Webanwendung kann auch durch das Entfernen der .war-Datei deaktiviert werden. Jedoch werden die .war-Datei und die Anwendung nach einer Aktualisierung des Routers wieder erscheinen. Somit ist das Deaktivieren der Web-Anwendung hier die bevorzugte Methode."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:350
msgid "Plugin Configuration"
-msgstr "Zusatzprogramm Konfiguration"
+msgstr "Konfiguration der Zusatzprogramme"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:352
msgid "The plugins listed below are started by the webConsole client."
-msgstr "Die unten aufgelisteten Zusatzprogramme werden vom WebKonsolen Klienten gestartet."
+msgstr "Die unten aufgelisteten Zusatzprogramme werden vom WebKonsolen-Klienten gestartet."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:358
msgid "Plugin Installation"
-msgstr "Zusatzprogramm Installation"
+msgstr "Installation von Zusatzprogrammen"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:360
msgid "To install a plugin, enter the download URL:"
-msgstr "Für die Installation eines Zusatzprogrammes bitte die Download URL eingeben:"
+msgstr "Für die Installation eines Zusatzprogramms bitte die Download-URL eingeben:"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:106
msgid "config keyring"
-msgstr "Schlüsselring einrichten"
+msgstr "Schlüsselbund einrichten"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:228
msgid "I2P Keyring Configuration"
-msgstr "I2P Schlüsselring Einstellungen"
+msgstr "Einstellungen des I2P-Schlüsselbunds"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:294
msgid "The router keyring is used to decrypt encrypted leaseSets."
-msgstr "Der Router Schlüsselring wird zum decodieren von verschlüsselten LeaseSets verwendet."
+msgstr "Der Router-Schlüsselbund wird zum Entschlüsseln verschlüsselter LeaseSets verwendet."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:297
msgid "The keyring may contain keys for local or remote encrypted destinations."
-msgstr "Der Schlüsselring kann Schlüssel für lokale oder entfernte verschlüsselte Leasesets enthalten."
+msgstr "Der Schlüsselbund kann Schlüssel für lokale oder entfernte verschlüsselte Leasesets enthalten."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:307
msgid "Manual Keyring Addition"
-msgstr "Manuelles hinzufügen zum Schlüsselring"
+msgstr "Manuelles Hinzufügen zum Schlüsselbund"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:309
msgid "Enter keys for encrypted remote destinations here."
-msgstr "Geben Sie hier die Schlüssel für entfernte verschlüsselte Ziele ein."
+msgstr "Geben Sie hier die Schlüssel für entfernte verschlüsselte Ziele ein!"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:312
msgid "Keys for local destinations must be entered on the"
@@ -4565,15 +4592,15 @@ msgstr "Schlüssel für lokale Ziele müssen dort eingegeben werden"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:314
msgid "I2PTunnel page"
-msgstr "I2PTunnel Seite"
+msgstr "I2PTunnel-Seite"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:316
msgid "Dest. name, hash, or full key"
-msgstr "Ziel Name, Prüfsumme oder ganzer Schlüssel"
+msgstr "Name des Ziels, Prüfsumme oder ganzer Schlüssel"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:318
msgid "Encryption Key"
-msgstr "Schlüssel zum codieren"
+msgstr "Schlüssel zum Kodieren"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:107
msgid "config logging"
@@ -4581,15 +4608,15 @@ msgstr "Berichte einrichten"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:242
msgid "I2P Logging Configuration"
-msgstr "I2P Berichte Einstellungen"
+msgstr "Einstellungen der I2P-Berichte"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:299
msgid "Configure I2P Logging Options"
-msgstr "Richte I2P Berichte ein"
+msgstr "Richte I2P-Berichte ein"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:301
msgid "Logging filename"
-msgstr "Berichte Dateiname"
+msgstr "Dateiname für Berichte"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:305
msgid "(the symbol '@' will be replaced during log rotation)"
@@ -4605,19 +4632,19 @@ msgstr "(Benutzen Sie 'd' = Datum, 'c' = Klasse, 't' = Thread, 'p' = Priorität,
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:313
msgid "Log date format"
-msgstr "Berichtedatei Datumsformat"
+msgstr "Datumsformat der Berichte"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:317
msgid "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' = millisecond)"
-msgstr "('MM' = Monat, 'dd' = Tag, 'HH' = Stund, 'mm' = Minute, 'ss' = Sekunde, 'SSS' = Millisekunde)"
+msgstr "('MM' = Monat, 'dd' = Tag, 'HH' = Stunde, 'mm' = Minute, 'ss' = Sekunde, 'SSS' = Millisekunde)"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:319
msgid "Max log file size"
-msgstr "Max Dateigröße Berichte"
+msgstr "max. Dateigröße der Berichte"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:323
msgid "Default log level"
-msgstr "Standard Berichte Level"
+msgstr "Standardlevel für Berichte"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:327
msgid "(DEBUG and INFO are not recommended defaults, as they will drastically slow down your router)"
@@ -4625,7 +4652,11 @@ msgstr "(DEBUG und INFO sind nicht empfohlen, da diese den Router drastisch verl
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:329
msgid "Log level overrides"
-msgstr "Berichte Level Sonderoptionen"
+msgstr "Berichtelevel - Sonderoptionen"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:333
+msgid "New override"
+msgstr "Neue Zusatzoption"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:106
msgid "config peers"
@@ -4633,35 +4664,35 @@ msgstr "Teilnehmer einrichten"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:228
msgid "I2P Peer Configuration"
-msgstr "I2P Teilnehmer Einstellungen"
+msgstr "Einstellungen zu I2P-Teilnehmern"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:304
msgid "Manual Peer Controls"
-msgstr "Manuelle Teilnehmer Kontrollen"
+msgstr "Manuelles Verwalten der Teilnehmer"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:306
msgid "Router Hash"
-msgstr "Router Prüfsumme"
+msgstr "Router-Prüfsumme"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:310
msgid "Manually Ban / Unban a Peer"
-msgstr "manuell einen Teilnehmer sperren/entsperren"
+msgstr "Einen Teilnehmer manuell sperren/entsperren"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:312
msgid "Banning will prevent the participation of this peer in tunnels you create."
-msgstr "Eine Sperrung verhindert das der Teilnehmer in von Ihnen aufgebauten Tunneln partizipiert."
+msgstr "Eine Sperrung verhindert, dass der Teilnehmer in von Ihnen aufgebauten Tunneln partizipiert."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:324
msgid "Bonuses may be positive or negative, and affect the peer's inclusion in Fast and High Capacity tiers. Fast peers are used for client tunnels, and High Capacity peers are used for some exploratory tunnels. Current bonuses are displayed on the"
-msgstr "Boni können positiv oder negativ sein, sie beeinflussen die Sortierung der Teilnehmer in die Schnelle und Hohe Kapazität Klassen. Schnelle Teilnehmer werden für Klienten Tunnel genutzt, Hohe Kapazität Teilnehmer für einige Erkundungstunnel. Derzeitige Boni werden hier dargestellt"
+msgstr "Boni können positiv oder negativ sein. Sie beeinflussen die Aufnahme der Teilnehmer in die Klassen schneller Router und Router hoher Kapazität. Schnelle Teilnehmer werden für Klienten-Tunnel genutzt, Teilnehmer mit hoher Kapazität für einige Erkundungstunnel. Derzeitige Boni werden dargestellt auf der "
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:326
msgid "profiles page"
-msgstr "Profile Seite"
+msgstr "Profile-Seite"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:342
msgid "Adjust peer bonuses"
-msgstr "Teilnehmer Boni anpassen"
+msgstr "Teilnehmer-Boni anpassen"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:344
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:253
@@ -4674,23 +4705,23 @@ msgstr "Gesperrte IPs"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:106
msgid "config service"
-msgstr "Services einrichten"
+msgstr "Dienste einrichten"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:228
msgid "I2P Service Configuration"
-msgstr "I2P Service Einstellungen"
+msgstr "I2P-Dienste-Einstellungen"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:284
msgid "Shutdown the router"
-msgstr "Den Router herunterfahren"
+msgstr "Router herunterfahren"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:286
msgid "Graceful shutdown lets the router satisfy the agreements it has already made before shutting down, but may take a few minutes."
-msgstr "Das kontrollierte Herunterfahren lässt dem Router alle Zusagen, die er gemacht hat, noch erfüllen, dafür benötigt es bis zu 11 Minuten."
+msgstr "Das kontrollierte Herunterfahren lässt dem Router Zeit, alle Zusagen, die er gemacht hat, noch zu erfüllen. Dafür benötigt er bis zu 11 Minuten."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:288
msgid "If you need to kill the router immediately, that option is available as well."
-msgstr "Es gibt auch eine Option zum sofortigen Beenden des Router, falls Sie dieses benötigen."
+msgstr "Es gibt auch eine Option zum sofortigen Beenden des Routers, falls Sie diese benötigen."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:298
msgid "If you want the router to restart itself after shutting down, you can choose one of the following."
@@ -4698,39 +4729,39 @@ msgstr "Falls Sie den Router nach dem Herunterfahren automatisch wieder starten
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:300
msgid "This is useful in some situations - for example, if you changed some settings that client applications only read at startup, such as the routerconsole password or the interface it listens on."
-msgstr "Dieses ist in manchen Situationen hilfreich - zum Beispiel wenn Sie einige Optionen geändert haben, die die Klient Anwendung nur beim Start einliest (Router Konsolen Passwort oder das Interface auf dem es arbeitet)."
+msgstr "Dies ist in manchen Situationen hilfreich - zum Beispiel wenn Sie einige Optionen geändert haben, die die Klient-Anwendung nur beim Starten einliest (Routerkonsolen-Passwort oder das Interface auf dem es arbeitet)."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:302
msgid "A graceful restart will take a few minutes (but your peers will appreciate your patience), while a hard restart does so immediately."
-msgstr "Ein kontrollierter Neustart benötigt bis zu 11 Minuten (aber Ihre Teilnehmer würdigen Ihre Geduld), ein harter Neustart erfolgt sofort."
+msgstr "Ein kontrollierter Neustart benötigt bis zu 11 Minuten (Ihre Teilnehmer sind für Ihre Geduld dankbar); ein harter Neustart erfolgt sofort."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:304
msgid "After tearing down the router, it will wait 1 minute before starting back up again."
-msgstr "Nachdem der Router heruntergefahren ist, wartet er eine Minute bevor er wieder startet."
+msgstr "Nachdem der Router heruntergefahren ist, wartet er eine Minute, bevor er wieder startet."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:314
msgid "Systray integration"
-msgstr "System Tray Integration"
+msgstr "Systemtray-Integration"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:316
msgid "On the windows platform, there is a small application to sit in the system tray, allowing you to view the router's status"
-msgstr "Auf Windows Systemen gibt es eine kleine Anwendung, die es Ihnen ermöglicht, den Router Status im System Tray zu sehen."
+msgstr "Auf Windows-Systemen gibt es eine kleine Anwendung, die es Ihnen ermöglicht, den Routerstatus im Systemtray zu sehen."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:318
msgid "(later on, I2P client applications will be able to integrate their own functionality into the system tray as well)."
-msgstr "(Später werden I2P Anwendungen auch ihre eigenen Funktionen im System Tray integrieren können)"
+msgstr "(Später werden I2P-Anwendungen auch ihre eigenen Funktionen in den Systemtray integrieren können)"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:320
msgid "If you are on windows, you can either enable or disable that icon here."
-msgstr "Falls Sie Windows nutzen können Sie hier dieses Bild aktiveren oder deaktivieren."
+msgstr "Falls Sie Windows nutzen, können Sie hier dieses Symbol aktiveren oder deaktivieren."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:326
msgid "Run on startup"
-msgstr "Beim Hochfahren starten."
+msgstr "Beim Hochfahren starten"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:328
msgid "You can control whether I2P is run on startup or not by selecting one of the following options - I2P will install (or remove) a service accordingly."
-msgstr "Sie können mit folgenden Optionen kontrollieren ob I2P beim Hochfahren gestartet wird oder nicht - I2P wird entsprechen einen Service einrichten (oder entfernen)."
+msgstr "Sie können mit folgenden Optionen festlegen, ob I2P beim Hochfahren gestartet wird oder nicht - I2P wird dementsprechend einen Service einrichten (oder ggf. entfernen)."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:330
msgid "If you prefer the command line, you can also run the "
@@ -4738,11 +4769,11 @@ msgstr "Falls Sie die Eingabeaufforderung bevorzugen, können Sie auch folgendes
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:340
msgid "If you are running I2P as service right now, removing it will shut down your router immediately."
-msgstr "Falls Sie I2P zur Zeit als Service gestartet haben wird ein Entfernen des Services den Router sofort beenden."
+msgstr "Falls Sie I2P zurzeit als Service gestartet haben, wird ein Entfernen des Services den Router sofort beenden."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:342
msgid "You may want to consider shutting down gracefully, as above, then running uninstall_i2p_service_winnt.bat."
-msgstr "Sie sollten wie oben genannt I2P kontrolliert herunterfahren und dann uninstall_i2p_service_winnt.bat ausführen."
+msgstr "Sie sollten I2P, wie oben beschrieben, kontrolliert herunterfahren und dann uninstall_i2p_service_winnt.bat ausführen."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:346
msgid "Debugging"
@@ -4754,15 +4785,15 @@ msgstr "Die Auftragswarteschlange ansehen"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:352
msgid "At times, it may be helpful to debug I2P by getting a thread dump. To do so, please select the following option and review the thread dumped to <a href=\"logs.jsp#servicelogs\">wrapper.log</a>."
-msgstr "Manchmal ist es zur Fehlerbeseitigung in I2P hilfreich eine Liste der aktiven Prozesse zu erzeugen. Dafür wählen Sie bitte folgende Option aus und überprüfen Sie die Liste der aktiven Prozesse in der <a href=\"logs.jsp#servicelogs\">wrapper.log Datei</a>."
+msgstr "Manchmal ist es zur Fehlerbeseitigung in I2P hilfreich, eine Liste der aktiven Prozesse zu erzeugen. Dafür wählen Sie bitte folgende Option aus und überprüfen die Liste der aktiven Prozesse in der <a href=\"logs.jsp#servicelogs\">wrapper.log Datei</a>!"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:358
msgid "Launch browser on router startup?"
-msgstr "Beim Start einen Browser aufrufen?"
+msgstr "Beim Starten einen Browser aufrufen?"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:360
msgid "I2P's main configuration interface is this web console, so for your convenience I2P can launch a web browser on startup pointing at"
-msgstr "Die Web Konsole ist I2P wichtigstes Interface für Einstellungen. Für Ihren Komfort kann I2P einen Browser mit folgender Seite als Startseite aufrufen"
+msgstr "Die Web-Konsole ist I2Ps wichtigstes Interface für Einstellungen. I2P kann für Sie beim Starten einen Browser öffnen und die Routerkonsole anzeigen, unter"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:107
msgid "config stats"
@@ -4770,19 +4801,19 @@ msgstr "Statistiken einrichten"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:229
msgid "I2P Stats Configuration"
-msgstr "I2P Statistik Einstellungen"
+msgstr "I2P - Einstellungen zu den Statistiken"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:300
msgid "Configure I2P Stat Collection"
-msgstr "I2P Statistik einstellen"
+msgstr "I2P-Statistiken anpassen"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:302
msgid "Enable full stats?"
-msgstr "Komplette Statistiken aktivieren?"
+msgstr "Vollständige Statistiken aktivieren?"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:309
msgid "change requires restart to take effect"
-msgstr "Änderungen benötigen einen Neustart"
+msgstr "Änderungen erfordern einen Routerneustart"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:311
msgid "Stat file"
@@ -4815,11 +4846,11 @@ msgstr "Tunnel einrichten"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:241
msgid "I2P Tunnel Configuration"
-msgstr "I2P Tunnel Einstellungen"
+msgstr "Einstellungen der I2P-Tunnel"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:305
msgid "The default settings work for most people."
-msgstr "Die Standard Einstellungen arbeiten für die meisten Leute."
+msgstr "Die Standardeinstellungen funktionieren für die meisten."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:309
msgid "There is a fundamental tradeoff between anonymity and performance."
@@ -4827,19 +4858,19 @@ msgstr "Es gibt einen grundsätzlichen Kompromiss zwischen Anonymität und Perfo
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:312
msgid "Tunnels longer than 3 hops (for example 2 hops + 0-2 hops, 3 hops + 0-1 hops, 3 hops + 0-2 hops), or a high quantity + backup quantity, may severely reduce performance or reliability."
-msgstr "Tunnel länger als 3 Zwischenstationen (z.B. 2+0-2, 3+0-1 oder 3+0-2) oder eine große Anzahl an Tunneln + Ersatztunneln kann die Performance oder Zuverlässigkeit erheblich reduzieren."
+msgstr "Tunnel mit mehr als 3 Zwischenstationen (z.B. 2+0-2, 3+0-1 oder 3+0-2) oder eine große Anzahl an Tunneln + Ersatztunneln kann die Performance oder Zuverlässigkeit erheblich verringern."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:315
msgid "High CPU and/or high outbound bandwidth usage may result."
-msgstr "Es können sich hohe CPU Last und/oder hohe ausgehende Bandbreite ergeben."
+msgstr "Eine hohe CPU-Last und/oder hohe ausgehende Bandbreite können die Folge sein."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:318
msgid "Change these settings with care, and adjust them if you have problems."
-msgstr "Ändern Sie diese Einstellungen nur wenn Sie Probleme und mit besonderer Vorsicht."
+msgstr "Ändern Sie diese Einstellungen nur, wenn Sie Probleme haben, und stets mit besonderer Vorsicht!"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:332
msgid "Exploratory tunnel setting changes are stored in the router.config file."
-msgstr "Einstellungen zu den Erkundungstunneln sind in der router.config Datei gespeichert."
+msgstr "Einstellungen der Erkundungstunnel sind in der Datei router.config gespeichert."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:335
msgid "Client tunnel changes are temporary and are not saved."
@@ -4847,11 +4878,11 @@ msgstr "Änderungen an den Kliententunneln sind nur temporär und werden nicht g
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:337
msgid "To make permanent client tunnel changes see the"
-msgstr "Um permanente Änderungen an den Kliententunneln zu machen, schauen Sie hier"
+msgstr "Um permanente Änderungen an den Kliententunneln zu machen, gehen Sie auf die "
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:339
msgid "i2ptunnel page"
-msgstr "I2PTunnel Seite"
+msgstr "I2PTunnel-Seite"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:106
msgid "config UI"
@@ -4859,11 +4890,11 @@ msgstr "konfiguriere UI"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:241
msgid "I2P UI Configuration"
-msgstr "I2P UI Konfiguration"
+msgstr "I2P UI-Konfiguration"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:291
msgid "Router Console Theme"
-msgstr "Thema der Router-Konsole"
+msgstr "Thema der Routerkonsole"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:309
msgid "Theme selection disabled for Internet Explorer, sorry."
@@ -4871,17 +4902,17 @@ msgstr "Themenauswahl für den Internet Explorer ist ausgeschaltet, bedauere."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:311
msgid "If you're not using IE, it's likely that your browser is pretending to be IE; please configure your browser (or proxy) to use a different User Agent string if you'd like to access the console themes."
-msgstr "Falls Sie nicht IE benutzen gibt ihr Browser wahrscheinlich vor IE zu nutzen; wenn sie die Konsolenthemen nutzen möchten ändern Sie bitte ihren Browser (oder Proxy) um einen anderen User Agent auszusenden "
+msgstr "Falls Sie nicht den Internet Explorer (IE) benutzen, gibt Ihr Browser wahrscheinlich vor, IE zu sein. Wenn Sie die Konsolenthemen nutzen möchten, ändern Sie bitte Ihren Browser (oder Proxy) so, dass er einen anderen User-Agenten sendet!"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:315
msgid "Router Console Language"
-msgstr "Sprache der Router-Konsole"
+msgstr "Sprache der Routerkonsole"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:319
msgid "Please contribute to the router console translation project! Contact the developers on IRC #i2p to help."
msgstr ""
-"Bitte tragen Sie dem Router-Konsolen Ãœbersetzungsprojekt bei! Kontaktieren \n"
-"Sie hierzu die Entwickler über den IRC-Kanal #i2p."
+"Bitte tragen Sie zum Routerkonsolen-Ãœbersetzungsprojekt bei! Kontaktieren \n"
+"Sie hierzu die Entwickler über den IRC-Kanal #i2p!"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:323
msgid "Apply"
@@ -4889,47 +4920,47 @@ msgstr "Anwenden"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:106
msgid "config update"
-msgstr "Konfigurations Update"
+msgstr "Aktualisierung der Konfiguration"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:228
msgid "I2P Update Configuration"
-msgstr "I2P Update Konfiguration"
+msgstr "Einstellungen zu Aktualisierungen von I2P"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:302
msgid "Check for I2P and news updates"
-msgstr "Überprüfe auf I2P und News Updates"
+msgstr "Überprüfe auf Aktualisierungen von I2P und auf Nachrichten"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:304
msgid "News & I2P Updates"
-msgstr "Neuigkeiten & I2P Updates"
+msgstr "Neuigkeiten & Aktualisierungen"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:308
msgid "Update In Progress"
-msgstr "Update im Gange"
+msgstr "Aktualisierung wird vorgenommen"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:316
msgid "News URL"
-msgstr "News-URL"
+msgstr "Nachrichten-URL"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:320
msgid "Refresh frequency"
-msgstr "Aktualisierungsrate"
+msgstr "Aktualisierungshäufigkeit"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:326
msgid "Update policy"
-msgstr "Update Regeln"
+msgstr "Aktualisierungsregeln"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:330
msgid "Update through the eepProxy?"
-msgstr "Update über den eepProxy?"
+msgstr "Aktualisierung durch den eepProxy?"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:334
msgid "eepProxy host"
-msgstr "eepProxy Host"
+msgstr "eepProxy-Host"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:338
msgid "eepProxy port"
-msgstr "eepProxy Port"
+msgstr "eepProxy-Port"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:342
msgid "Update URLs"
@@ -4945,11 +4976,11 @@ msgstr "Aktualisieren mit unsignierten Entwicklerversionen?"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:354
msgid "Unsigned Build URL"
-msgstr "URL für nicht signierte Updates"
+msgstr "URL für nicht signierte Aktualisierungen"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:360
msgid "I2P updates are disabled because you do not have write permission for the install directory."
-msgstr "Updates für I2P sind deaktiviert da Sie (I2P) keine Schreibberechtigung auf das Installationsverzeichnis haben."
+msgstr "Aktualisierungen für I2P sind deaktiviert, da Sie (I2P) keine Schreibberechtigung im Installationsverzeichnis haben."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:366
msgid "Save"
@@ -4962,7 +4993,7 @@ msgstr "Seite nicht gefunden"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:243
msgid "Sorry! You appear to be requesting a non-existent Router Console page or resource."
msgstr ""
-"Bedauere! Anscheinend haben Sie eine nicht vorhandene Router-Konsolenseite\n"
+"Bedaure. Anscheinend haben Sie eine nicht vorhandene Routerkonsolenseite\n"
"oder -Ressource angefordert."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:245
@@ -4979,11 +5010,11 @@ msgstr "Diagramme"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:228
msgid "I2P Performance Graphs"
-msgstr "I2P Leistungsdiagramme"
+msgstr "I2P-Leistungsdiagramme"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/index_jsp.java:105
msgid "home"
-msgstr "Home"
+msgstr "Heim"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:105
msgid "job queue"
@@ -4991,7 +5022,7 @@ msgstr "Auftragswarteschlange"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:227
msgid "I2P Router Job Queue"
-msgstr "I2P Router Auftragswarteschlange"
+msgstr "I2P-Router-Auftragswarteschlange"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:105
msgid "logs"
@@ -4999,27 +5030,27 @@ msgstr "Protokolle"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:227
msgid "I2P Router Logs"
-msgstr "I2P Router Protokolle"
+msgstr "I2P-Router-Protokolle"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:229
msgid "I2P Version & Running Environment"
-msgstr "I2P Version & Laufzeitumgebung"
+msgstr "I2P-Version & Laufzeitumgebung"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:231
msgid "Please report bugs on <a href=\"http://trac.i2p2.i2p/newticket\">trac.i2p2.i2p</a>."
-msgstr "Bitte berichten Sie über Fehler und Bugs auf <a href=\"http://trac.i2p2.i2p/newticket\">trac.i2p2.i2p</a>."
+msgstr "Bitte berichten Sie über Fehler auf <a href=\"http://trac.i2p2.i2p/newticket\">trac.i2p2.i2p</a>!"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:233
msgid "Please include this information in bug reports"
-msgstr "Bitte fügen Sie folgende Informationen dem Bug-Report hinzu"
+msgstr "Bitte fügen Sie folgende Informationen dem Bugreport bei!"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:274
msgid "Critical Logs"
-msgstr "Berichte der Kritischen Ereignisse"
+msgstr "Berichte kritischer Ereignisse"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:278
msgid "Router Logs"
-msgstr "Router Berichte"
+msgstr "Router-Berichte"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:284
msgid "Service (Wrapper) Logs"
@@ -5031,7 +5062,7 @@ msgstr "Netzwerkdatenbank Zusammenfassung"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:227
msgid "I2P Network Database Summary"
-msgstr "I2P Netzwerkdatenbank Zusammenfassung"
+msgstr "I2P-Netzwerkdatenbank Zusammenfassung"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:109
msgid "WebApp Not Found"
@@ -5043,19 +5074,19 @@ msgstr "Web Applikation ist nicht aktiv"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:233
msgid "The requested web application is not running."
-msgstr "Die angeforderte Web Anwendung ist nicht aktiv."
+msgstr "Die angeforderte Web-Anwendung ist nicht aktiv."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:235
msgid "Please visit the <a href=\"/configclients.jsp#webapp\">config clients page</a> to start it."
-msgstr "Bitte besuchen Sie die <a href=\"/configclients.jsp#webapp\">Klienten konfigurations Seite</a> um diese zu starten."
+msgstr "Bitte besuchen Sie die <a href=\"/configclients.jsp#webapp\">Klienten-Konfigurations Seite</a>, um diese zu starten."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:105
msgid "peer connections"
-msgstr "Teilnehmer Verbindungen"
+msgstr "Verbindungen zu Teilnehmern"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:227
msgid "I2P Network Peers"
-msgstr "I2P Netzwerkteilnehmer"
+msgstr "I2P-Netzwerkteilnehmer"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:105
msgid "peer profiles"
@@ -5063,7 +5094,7 @@ msgstr "Teilnehmerprofile"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:227
msgid "I2P Network Peer Profiles"
-msgstr "I2P Netzwerkteilnehmerprofile"
+msgstr "Profile der I2P-Netzwerkteilnehmer"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:105
msgid "statistics"
@@ -5071,12 +5102,12 @@ msgstr "Statistiken"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:242
msgid "I2P Router Statistics"
-msgstr "I2P Router Statistiken"
+msgstr "I2P-Router-Statistiken"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:244
#, java-format
msgid "Disable {0}s Refresh"
-msgstr "alle {0} s auffrischen ausschalten"
+msgstr "alle {0}s Auffrischen ausschalten"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:105
msgid "tunnel summary"
@@ -5084,7 +5115,7 @@ msgstr "Tunnel Zusammenfassung"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:227
msgid "I2P Tunnel Summary"
-msgstr "I2P Tunnel Zusammenfassung"
+msgstr "I2P-Tunnel Zusammenfassung"
#~ msgid ""
#~ "WebApp configuration saved successfully - restart required to take effect."
diff --git a/apps/routerconsole/locale/messages_ru.po b/apps/routerconsole/locale/messages_ru.po
index ddbbc7fdb828a8755faaf3181596883a5bdccdb9..bc08bb1a53cb7907eae72d7b0bf72814ff38ab29 100644
--- a/apps/routerconsole/locale/messages_ru.po
+++ b/apps/routerconsole/locale/messages_ru.po
@@ -8,10 +8,11 @@ msgid ""
msgstr ""
"Project-Id-Version: I2P routerconsole\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-07 20:03+0000\n"
-"PO-Revision-Date: 2010-07-07 20:06+0000\n"
-"Last-Translator: 4get <forget@mail.i2p>\n"
+"POT-Creation-Date: 2010-11-13 18:50+0000\n"
+"PO-Revision-Date: 2010-11-14 23:29+0500\n"
+"Last-Translator: Hidden Z <hiddenz@mail.i2p>\n"
"Language-Team: \n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -83,46 +84,46 @@ msgstr "Принимаем туннели"
#. if (_context.router().getRouterInfo().getBandwidthTier().equals("K"))
#. setTunnelStatus("Not expecting tunnel requests: Advertised bandwidth too low");
#. else
-#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:487
+#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:488
msgid "Rejecting tunnels"
msgstr "Ðе принимаем туннели"
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:48
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:50
msgid "Ensure that nothing blocks outbound HTTP, check <a target=\"_top\" href=\"logs.jsp\">logs</a> and if nothing helps, read the <a target=\"_top\" href=\"http://www.i2p2.de/faq.html\">FAQ</a> about reseeding manually."
-msgstr "УбедитеÑÑŒ, что иÑходÑщие HTTP-запроÑÑ‹ ничем не блокируютÑÑ, заглÑните в <a href=logs.jsp>журналы ошибок</a> и еÑли ничто не помогло, прочтите в <a target=\"_top\" href=\"http://www.i2p2.de/faq.html\">FAQ</a> инÑтрукцию по начальной загрузке вручную."
+msgstr "УбедитеÑÑŒ, что иÑходÑщие HTTP-запроÑÑ‹ ничем не блокируютÑÑ, заглÑните в <a href=logs.jsp>логи</a> и еÑли ничто не помогло, прочтите в <a target=\"_top\" href=\"http://www.i2p2.de/faq.html\">FAQ</a> инÑтрукцию по начальной загрузке вручную."
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:80
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:82
msgid "Reseeding"
msgstr "ПроизводитÑÑ Ð½Ð°Ñ‡Ð°Ð»ÑŒÐ½Ð°Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ°"
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:144
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:146
msgid "Reseeding: fetching seed URL."
msgstr "ПроизводитÑÑ Ð½Ð°Ñ‡Ð°Ð»ÑŒÐ½Ð°Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ°: загружаетÑÑ URL каталога маршрутизаторов."
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:150
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:152
msgid "Last reseed failed fully (failed reading seed URL)."
msgstr "ÐŸÑ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð°Ñ Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐ° начальной загрузки полноÑтью провалилаÑÑŒ (не удалоÑÑŒ загрузить URL каталога маршрутизаторов)"
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:176
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:178
msgid "Last reseed failed fully (no routerInfo URLs at seed URL)."
msgstr "ÐŸÑ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð°Ñ Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐ° начальной загрузки полноÑтью провалилаÑÑŒ (не удалоÑÑŒ найти ÑпиÑок routerInfo-ÑÑылок в загруженном каталоге)"
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:189
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:191
#, java-format
msgid "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
msgstr "ПроизводитÑÑ Ð½Ð°Ñ‡Ð°Ð»ÑŒÐ½Ð°Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ°: получение информации о маршрутизаторах ({0} удачно, {1} ошибок)."
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212
#, java-format
msgid "Last reseed failed partly ({0}% of {1})."
msgstr "ÐŸÑ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð°Ñ Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐ° начальной загрузки чаÑтично не удалаÑÑŒ ({0}% из {1})."
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:215
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:217
#, java-format
msgid "Last reseed failed ({0}% of {1})."
msgstr "ÐŸÑ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð°Ñ Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐ° начальной загрузки почти полноÑтью провалилаÑÑŒ ({0}% из {1})."
-#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:225
+#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:227
msgid "Last reseed failed fully (exception caught)."
msgstr "ÐŸÑ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð°Ñ Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐ° начальной загрузки полноÑтью провалилаÑÑŒ (произошла Ð½ÐµÐ¾Ð±Ñ€Ð°Ð±Ð°Ñ‚Ñ‹Ð²Ð°ÐµÐ¼Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°)."
@@ -135,27 +136,27 @@ msgstr "показать опиÑание в NetDb"
msgid "No transports (hidden or starting up?)"
msgstr "Ðет транÑпортных протоколов (в Ñкрытом режиме или запущен недавно?)"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:457
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:451
msgid "Unreachable on any transport"
msgstr "ÐедоÑтупен по вÑем транÑпортным протоколам"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:508
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:500
msgid "Router Transport Addresses"
msgstr "ÐдреÑа транÑпортов маршрутизатора"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:514
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:505
#, java-format
msgid "{0} is used for outbound connections only"
msgstr "{0} иÑпользуетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ Ð¸ÑходÑщих Ñоединений"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:528
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:519
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:257
msgid "Definitions"
msgstr "УÑловные обозначениÑ"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:529
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:520
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:715
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1885
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1888
#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:24
#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:33
#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:35
@@ -165,154 +166,154 @@ msgstr "УÑловные обозначениÑ"
msgid "Peer"
msgstr "Пир"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:529
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:520
msgid "The remote peer, identified by router hash"
msgstr "Уникальный идентификатор пира (неÑколько начальных Ñимволов из хеша его маршрутизатора)"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:530
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:521
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:716
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1889
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1892
msgid "Dir"
msgstr "Ðаправление"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:531
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:522
msgid "Inbound connection"
msgstr "ВходÑщее Ñоединение"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:533
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:524
msgid "Outbound connection"
msgstr "ИÑходÑщее Ñоединение"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:535
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:526
msgid "They offered to introduce us (help other peers traverse our firewall)"
msgstr "Ðтот пир предлагает ÑÐµÐ±Ñ Ð² качеÑтве нашего поÑредника (Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы другие пиры могли ÑоединÑÑ‚ÑŒÑÑ Ñ Ð½Ð°Ð¼Ð¸ в обход нашего брандмауÑра)"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:537
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:528
msgid "We offered to introduce them (help other peers traverse their firewall)"
msgstr "Мы предлагаем ÑÐµÐ±Ñ Ð² качеÑтве поÑредника Ð´Ð»Ñ Ñтого пира (Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы другие пиры могли ÑоединÑÑ‚ÑŒÑÑ Ñ Ð½Ð¸Ð¼ в обход его брандмауÑра)"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:538
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:529
msgid "How long since a packet has been received / sent"
msgstr "Сколько прошло времени поÑле приёма/передачи поÑледнего пакета"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:538
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:529
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:717
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1890
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1893
msgid "Idle"
msgstr "Ðеактивен"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:539
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:530
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:718
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1895
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1898
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:156
msgid "In/Out"
msgstr "Приём/Передача"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:539
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:530
msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
msgstr "УÑреднённые ÑкороÑти приёма / передачи (КБайт/Ñек) "
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:540
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:531
msgid "How long ago this connection was established"
msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¶Ð¸Ð·Ð½Ð¸ ÑоединениÑ"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:540
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:531
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:719
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1900
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1903
msgid "Up"
msgstr "Подключен"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:541
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:532
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:720
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1902
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1905
msgid "Skew"
msgstr "Сдвиг"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:541
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:532
msgid "The difference between the peer's clock and your own"
msgstr "Разница хода чаÑов между пиром и нами"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:542
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:533
msgid "The congestion window, which is how many bytes can be sent without an acknowledgement"
msgstr "<i>Congestion Window.</i> Окно наÑÑ‹Ñ‰ÐµÐ½Ð¸Ñ â€” количеÑтво байт, которое мы можем поÑлать до Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:543
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:534
msgid "The number of sent messages awaiting acknowledgement"
msgstr "КоличеÑтво отправленных Ñообщений ожидающих подтверждениÑ"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:544
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:535
msgid "The maximum number of concurrent messages to send"
msgstr "МакÑимальное количеÑтво параллельно отправлÑемых Ñообщений"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:545
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:536
msgid "The number of pending sends which exceed congestion window"
msgstr "КоличеÑтво ожидающих поÑылок превоÑходÑщих размер окна наÑыщениÑ"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:546
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:537
msgid "The slow start threshold"
msgstr "<i>Slow Start Threshold.</i> Величина порога медленного Ñтарта"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:547
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:538
msgid "The round trip time in milliseconds"
msgstr "<i>Round-Trip Time.</i> Ð’Ñ€ÐµÐ¼Ñ Ð¼ÐµÐ¶Ð´Ñƒ отправкой запроÑа и получением ответа (миллиÑекунды)"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:548
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1912
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:539
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1915
msgid "Dev"
msgstr "Отклонение"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:548
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:539
msgid "The standard deviation of the round trip time in milliseconds"
msgstr "СреднеквадратичеÑкое отклонение RTT (миллиÑекунды)"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:549
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:540
msgid "The retransmit timeout in milliseconds"
msgstr "<i>Retransmit Time-Out.</i> Ð’Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ´ повторной поÑылкой пакета (миллиÑекунды)"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:550
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:541
msgid "Current maximum send packet size / estimated maximum receive packet size (bytes)"
msgstr "<i>Maximum Transfer Unit.</i> Текущий макÑимальный размер иÑходÑщего пакета / макÑимальный размер принÑтого пакета (байт) "
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:551
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:542
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:721
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1919
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1922
msgid "TX"
msgstr "Передано"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:551
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:542
msgid "The total number of packets sent to the peer"
msgstr "Общее количеÑтво поÑланных пиру пакетов"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:552
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:543
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:722
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1921
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1924
msgid "RX"
msgstr "ПринÑто"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:552
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:543
msgid "The total number of packets received from the peer"
msgstr "Общее количеÑтво принÑÑ‚Ñ‹Ñ… от пира пакетов"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:553
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1924
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:544
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1927
msgid "Dup TX"
msgstr "Повт. принÑто"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:553
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:544
msgid "The total number of packets retransmitted to the peer"
msgstr "Общее количеÑтво повторно поÑланных пиру пакетов"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:554
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1926
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:545
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1929
msgid "Dup RX"
msgstr "Повт. передано"
-#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:554
+#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:545
msgid "The total number of duplicate packets received from the peer"
msgstr "Общее количеÑтво повторно принÑÑ‚Ñ‹Ñ… от пира пакетов"
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:380
-#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:594
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:409
+#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:627
#, java-format
msgid "Excessive clock skew: {0}"
msgstr "Чрезмерное раÑхождение времени: {0}"
@@ -322,12 +323,12 @@ msgid "NTCP connections"
msgstr "NTCP ÑоединениÑ"
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:711
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1881
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1884
msgid "Limit"
msgstr "Ограничение"
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:712
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1882
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1885
msgid "Timeout"
msgstr "Таймаут"
@@ -340,13 +341,13 @@ msgid "Backlogged?"
msgstr "В очереди?"
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:738
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1944
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1947
#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:82
msgid "Inbound"
msgstr "ВходÑщие"
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:740
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1946
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1949
#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:82
msgid "Outbound"
msgstr "ИÑходÑщие"
@@ -356,110 +357,110 @@ msgstr "ИÑходÑщие"
msgid "peers"
msgstr "пиров"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1880
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1883
msgid "UDP connections"
msgstr "UDP ÑоединениÑ"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1887
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1890
msgid "Sort by peer hash"
msgstr "Сортировать по идентификатору пира"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1889
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1892
msgid "Direction/Introduction"
msgstr "Ðаправление / ПоÑредничеÑтво"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1891
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1894
msgid "Sort by idle inbound"
msgstr "Сортировать по неактивноÑти приёма"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1893
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1896
msgid "Sort by idle outbound"
msgstr "Сортировать по неактивноÑти передачи"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1896
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1899
msgid "Sort by inbound rate"
msgstr "Сортировать по ÑкороÑти приёма"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1898
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1901
msgid "Sort by outbound rate"
msgstr "Сортировать по ÑкороÑти передачи"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1901
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1904
msgid "Sort by connection uptime"
msgstr "Сортировать по времени жизни ÑоединениÑ"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1903
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1906
msgid "Sort by clock skew"
msgstr "Сортировать по раÑхождению чаÑов"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1906
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1909
msgid "Sort by congestion window"
msgstr "Сортировать по размеру окна наÑыщениÑ"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1908
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1911
msgid "Sort by slow start threshold"
msgstr "Сортировать по размеру порога медленного Ñтарта"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1911
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1914
msgid "Sort by round trip time"
msgstr "Сортировать по времени Ð¿Ñ€Ð¾Ñ…Ð¾Ð¶Ð´ÐµÐ½Ð¸Ñ Ñигнала"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1913
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1916
msgid "Sort by round trip time deviation"
msgstr "Сортировать по отклонению времени Ð¿Ñ€Ð¾Ñ…Ð¾Ð¶Ð´ÐµÐ½Ð¸Ñ Ñигнала"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1915
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1918
msgid "Sort by retransmission timeout"
msgstr "Сортировать по таймауту передачи"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1918
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1921
msgid "Sort by outbound maximum transmit unit"
msgstr "Сортировать по размеру иÑходÑщего MTU"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1920
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1923
msgid "Sort by packets sent"
msgstr "Сортировать по количеÑтву поÑланных пакетов"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1922
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1925
msgid "Sort by packets received"
msgstr "Сортировать по количеÑтву принÑÑ‚Ñ‹Ñ… пакетов"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1925
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1928
msgid "Sort by packets retransmitted"
msgstr "Сортировать по количеÑтву повторно поÑланных пакетов"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1927
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1930
msgid "Sort by packets received more than once"
msgstr "Сортировать по количеÑтву повторно принÑÑ‚Ñ‹Ñ… пакетов"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1948
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1951
msgid "We offered to introduce them"
msgstr "Мы предлагаем ÑÐµÐ±Ñ Ð² качеÑтве поÑредника Ð´Ð»Ñ Ñтого пира"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1950
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1953
msgid "They offered to introduce us"
msgstr "Ðтот пир предлагает ÑÐµÐ±Ñ Ð² качеÑтве нашего поÑредника"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1954
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1957
msgid "Choked"
msgstr "ДроÑÑелирован"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1962
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1965
msgid "1 fail"
msgstr "1 Ñбой"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1964
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1967
#, java-format
msgid "{0} fails"
msgstr "{0} ÑбоÑ(-ев)"
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1970
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1973
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:162
msgid "Banned"
msgstr "Забанен"
#. buf.append("<tr><td colspan=\"16\"><hr></td></tr>\n");
-#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2102
+#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2105
msgid "SUMMARY"
msgstr "ИТОГО"
@@ -472,19 +473,19 @@ msgstr "Игнорируем запроÑÑ‹ туннелей: Ð’Ñ€ÐµÐ¼Ñ Ð²Ñ‹Ð¿
msgid "Dropping tunnel requests: Overloaded"
msgstr "Игнорируем запроÑÑ‹ туннелей: Слишком выÑÐ¾ÐºÐ°Ñ Ð½Ð°Ð³Ñ€ÑƒÐ·ÐºÐ°"
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:523
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:525
msgid "Rejecting tunnels: Request overload"
msgstr "Ðе принимаем туннели: Слишком много запроÑов"
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:548
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:550
msgid "Rejecting tunnels: Connection limit"
msgstr "Ðе принимаем туннели: ДоÑтигнут предел количеÑтва Ñоединений"
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:742
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:744
msgid "Dropping tunnel requests: High load"
msgstr "Игнорируем запроÑÑ‹ туннелей: Ð’Ñ‹ÑÐ¾ÐºÐ°Ñ Ð½Ð°Ð³Ñ€ÑƒÐ·ÐºÐ°"
-#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:751
+#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:753
msgid "Dropping tunnel requests: Queue time"
msgstr "Игнорируем запроÑÑ‹ туннелей: Слишком большое Ð²Ñ€ÐµÐ¼Ñ Ð¿Ñ€ÐµÐ±Ñ‹Ð²Ð°Ð½Ð¸Ñ Ð² очереди"
@@ -1425,7 +1426,7 @@ msgstr "КонÑоль маршрутизатора I2P"
#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:57
msgid "Error updating the configuration - please see the error logs"
-msgstr "Ðе удалоÑÑŒ обновить наÑтройки — заглÑните в журнал ошибок"
+msgstr "Ðе удалоÑÑŒ обновить наÑтройки — заглÑните в логи ошибок"
#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:69
#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:266
@@ -1435,7 +1436,7 @@ msgstr "ÐаÑтройки Ñохранены"
#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71
#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:268
msgid "Error saving the configuration (applied but not saved) - please see the error logs"
-msgstr "Ðе удалоÑÑŒ Ñохранить наÑтройки (применены, но не Ñохранены) — заглÑните в журнал ошибок"
+msgstr "Ðе удалоÑÑŒ Ñохранить наÑтройки (применены, но не Ñохранены) — заглÑните в логи ошибок"
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:34
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:334
@@ -1495,7 +1496,7 @@ msgstr "Добавлен новый клиент"
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:188
msgid "Client configuration saved successfully - restart required to take effect."
-msgstr "ÐаÑтройки клиентов Ñохранены, требуетÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° маршрутизатора Ð´Ð»Ñ Ð²ÑÑ‚ÑƒÐ¿Ð»ÐµÐ½Ð¸Ñ Ð² Ñилу."
+msgstr "ÐаÑтройки клиентов Ñохранены, требуетÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑк маршрутизатора Ð´Ð»Ñ Ð²ÑÑ‚ÑƒÐ¿Ð»ÐµÐ½Ð¸Ñ Ð² Ñилу."
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:202
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:213
@@ -1557,7 +1558,7 @@ msgid "Plugin or update download already in progress."
msgstr "Загрузка плагина или Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑƒÐ¶Ðµ запущена."
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:306
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:117
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:118
#, java-format
msgid "Downloading plugin from {0}"
msgstr "ПроизводитÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° плагина Ñ {0}"
@@ -1614,7 +1615,7 @@ msgid "Plugin"
msgstr "Плагин"
#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:95
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:268
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:271
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180
msgid "Version"
msgstr "ВерÑиÑ"
@@ -1713,43 +1714,59 @@ msgstr "не найден в ÑвÑзке ключей"
msgid "Invalid destination"
msgstr "Ðекорректный Ð°Ð´Ñ€ÐµÑ Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ"
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:46
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:82
+msgid "Log overrides updated"
+msgstr "ÐŸÐµÑ€ÐµÐ¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð»Ð¾Ð³Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ñ‹"
+
+#: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:160
+msgid "Log configuration saved"
+msgstr "ÐаÑтройки Ð»Ð¾Ð³Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñохранены"
+
+#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:48
msgid "Add additional logging statements above. Example: net.i2p.router.tunnel=WARN"
-msgstr "Впишите выше дополнительные наÑтройки уровней детальноÑти журнала. Пример: net.i2p.router.tunnel=WARN"
+msgstr "Впишите выше дополнительные наÑтройки уровней детализации лога. Пример: net.i2p.router.tunnel=WARN"
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:47
+#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:49
msgid "Or put entries in the logger.config file. Example: logger.record.net.i2p.router.tunnel=WARN"
msgstr "Либо добавьте Ñти запиÑи в файл logger.config. Пример: logger.record.net.i2p.router.tunnel=WARN"
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:48
+#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:50
msgid "Valid levels are DEBUG, INFO, WARN, ERROR, CRIT"
msgstr "Поддерживаемые уровни: DEBUG, INFO, WARN, ERROR, CRIT"
# This term intentionally left in English
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52
+#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
msgid "CRIT"
msgstr "CRIT"
# This term intentionally left in English
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52
+#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
msgid "DEBUG"
msgstr "DEBUG"
# This term intentionally left in English
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52
+#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
msgid "ERROR"
msgstr "ERROR"
# This term intentionally left in English
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52
+#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
msgid "INFO"
msgstr "INFO"
# This term intentionally left in English
-#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52
+#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:68
msgid "WARN"
msgstr "WARN"
+#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88
+msgid "Remove"
+msgstr "Удалить"
+
+#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:125
+msgid "Select a class to add"
+msgstr "Выберите клаÑÑ Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ"
+
#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:199
msgid "Network"
@@ -1781,7 +1798,7 @@ msgstr "Ключи"
#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
msgid "Logging"
-msgstr "Журнал"
+msgstr "Логи"
#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:106
@@ -1791,14 +1808,14 @@ msgid "Peers"
msgstr "Пиры"
#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:382
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:387
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:142
msgid "Stats"
msgstr "СтатиÑтика"
#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
msgid "Advanced"
-msgstr "Дополнительно"
+msgstr "РаÑширенные"
#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:48
#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:264
@@ -1806,7 +1823,7 @@ msgstr "Дополнительно"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:359
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:515
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:305
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:339
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:375
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:343
msgid "Save changes"
@@ -1854,19 +1871,19 @@ msgstr "на"
#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:221
msgid "Gracefully restarting into Hidden Router Mode"
-msgstr "ÐŸÐ»Ð°Ð²Ð½Ð°Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ð° в Ñкрытый режим"
+msgstr "Плавный перезапуÑк Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ð° в Ñкрытый режим"
#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:223
msgid "Gracefully restarting to exit Hidden Router Mode"
-msgstr "ÐŸÐ»Ð°Ð²Ð½Ð°Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° Ð´Ð»Ñ Ð²Ñ‹Ñ…Ð¾Ð´Ð° из Ñкрытого режима"
+msgstr "Плавный перезапуÑк Ð´Ð»Ñ Ð²Ñ‹Ñ…Ð¾Ð´Ð° из Ñкрытого режима"
#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:232
msgid "Enabling UPnP, restart required to take effect"
-msgstr "UPnP включен, необходима перезагрузка маршрутизатора"
+msgstr "UPnP включен, необходим перезапуÑк маршрутизатора"
#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:234
msgid "Disabling UPnP, restart required to take effect"
-msgstr "UPnP выключен, необходима перезагрузка маршрутизатора"
+msgstr "UPnP выключен, необходим перезапуÑк маршрутизатора"
#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:242
msgid "Enabling laptop mode"
@@ -1884,7 +1901,7 @@ msgstr "Запрашиваем SSU-поÑредников"
#. But it would be hard to get right, so just do a restart.
#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:291
msgid "Gracefully restarting I2P to change published router address"
-msgstr "ÐŸÐ»Ð°Ð²Ð½Ð°Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° Ð´Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿ÑƒÐ±Ð»Ð¸ÐºÑƒÐµÐ¼Ð¾Ð³Ð¾ адреÑа"
+msgstr "Плавный перезапуÑк Ð´Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿ÑƒÐ±Ð»Ð¸ÐºÑƒÐµÐ¼Ð¾Ð³Ð¾ адреÑа"
#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:314
msgid "Updating bandwidth share percentage"
@@ -1914,7 +1931,7 @@ msgstr "или {0} байт/меÑÑц макÑимум"
#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:20
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:314
msgid "Ban peer until restart"
-msgstr "Забанить пира до перезагрузки маршрутизатора"
+msgstr "Забанить пира до перезапуÑка маршрутизатора"
#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:23
#, java-format
@@ -1923,7 +1940,7 @@ msgstr "Забанен вручную через {0}"
#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:24
msgid "banned until restart"
-msgstr "забанен до перезагрузки"
+msgstr "забанен до перезапуÑка"
#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:27
#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:38
@@ -1972,17 +1989,17 @@ msgstr "Отменить выключение"
#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:37
msgid "Cancel restart"
-msgstr "Отменить перезагрузку"
+msgstr "Отменить перезапуÑк"
#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:39
msgid "Restart immediately"
-msgstr "Перезагрузить немедленно"
+msgstr "ПерезапуÑтить немедленно"
#. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns
#. give the UI time to respond
#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:43
msgid "Restart"
-msgstr "Перезагрузить"
+msgstr "ПерезапуÑтить"
#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:46
msgid "Shutdown"
@@ -1990,7 +2007,7 @@ msgstr "Выключить"
#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:59
msgid "Restart imminent"
-msgstr "ÐеотменÑÐµÐ¼Ð°Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ°"
+msgstr "ÐеотменÑемый перезапуÑк"
#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:61
msgid "Shutdown imminent"
@@ -2004,7 +2021,7 @@ msgstr "Выключение через {0}"
#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:70
#, java-format
msgid "Restart in {0}"
-msgstr "Перезагрузка через {0}"
+msgstr "ПерезапуÑк через {0}"
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:53
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:290
@@ -2031,28 +2048,28 @@ msgstr "Плавное отключение отменено"
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:64
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:306
msgid "Graceful restart"
-msgstr "Перезагрузить плавно"
+msgstr "ПерезапуÑтить плавно"
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:67
msgid "Graceful restart requested"
-msgstr "Запущена Ð¿Ð»Ð°Ð²Ð½Ð°Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ°"
+msgstr "Запущен плавный перезапуÑк"
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:68
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:308
msgid "Hard restart"
-msgstr "Перезагрузить немедленно"
+msgstr "ПерезапуÑтить немедленно"
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:71
msgid "Hard restart requested"
-msgstr "Запрошена быÑÑ‚Ñ€Ð°Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ°"
+msgstr "Запрошен быÑтрый перезапуÑк"
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:72
msgid "Rekey and Restart"
-msgstr "Сменить ключ и перезагрузить"
+msgstr "Сменить ключ и перезапуÑтить"
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:73
msgid "Rekeying after graceful restart"
-msgstr "Смена ключа поÑле плавной перезагрузки"
+msgstr "Смена ключа поÑле плавного перезапуÑка"
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:76
msgid "Rekey and Shutdown"
@@ -2075,7 +2092,7 @@ msgstr "Ðе запуÑкать I2P при Ñтарте"
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:84
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:354
msgid "Dump threads"
-msgstr "ВывеÑти ÑпиÑок тредов"
+msgstr "ВывеÑти ÑпиÑок потоков"
#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:91
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:322
@@ -2164,7 +2181,7 @@ msgstr "ÐаÑтройки зондирующих туннелей Ñохран
#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:144
#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:36
msgid "Error saving the configuration (applied but not saved) - please see the error logs."
-msgstr "Ðе удалоÑÑŒ Ñохранить наÑтройки (применены, но не Ñохранены) — заглÑните в журнал ошибок"
+msgstr "Ðе удалоÑÑŒ Ñохранить наÑтройки (применены, но не Ñохранены) — заглÑните в логи ошибок"
#. * dummies for translation
#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:14
@@ -2419,178 +2436,186 @@ msgstr "ПерериÑовать"
#: ../java/src/net/i2p/router/web/LogsHelper.java:13
#: ../java/src/net/i2p/router/web/LogsHelper.java:37
msgid "File location"
-msgstr "Путь к файлу журнала"
+msgstr "Путь к лог-файлу"
+
+#: ../java/src/net/i2p/router/web/LogsHelper.java:34
+msgid "File not found"
+msgstr "Файл не найден"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:77
+#: ../java/src/net/i2p/router/web/LogsHelper.java:50
+msgid "No log messages"
+msgstr "Ðет Ñообщений"
+
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:80
msgid "Network Database RouterInfo Lookup"
msgstr "ПроÑмотр RouterInfo"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:95
#: ../java/strings/Strings.java:68
msgid "Router"
msgstr "Маршрутизатор"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:95
msgid "not found in network database"
msgstr "не найден в Ñетевой базе данных"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:104
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:212
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:107
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:215
msgid "Network Database Contents"
msgstr "ПроÑмотр Ñетевой базы данных"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:108
msgid "View RouterInfo"
msgstr "Показать ÑпиÑок RouterInfo"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:106
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:109
msgid "LeaseSets"
msgstr "СпиÑок LeaseSet"
# This term intentionally left in English
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:128
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:131
msgid "LeaseSet"
msgstr "LeaseSet"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:130
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:133
msgid "Local"
msgstr "Локальный"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:132
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:135
msgid "Unpublished"
msgstr "Ðеопубликованный"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:133
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:140
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:136
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143
msgid "Destination"
msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:150
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:153
#, java-format
msgid "Expires in {0}"
msgstr "ИÑтекает через {0}"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:152
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:155
#, java-format
msgid "Expired {0} ago"
msgstr "ИÑтек {0} назад"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:164
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:167
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:156
msgid "Gateway"
msgstr "Шлюз"
# This term intentionally left in English
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:164
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:167
msgid "Lease"
msgstr "Lease"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:166
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:169
msgid "Tunnel"
msgstr "Туннель"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:212
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:215
msgid "View LeaseSets"
msgstr "Показать ÑпиÑок LeaseSet"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:214
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217
msgid "Not initialized"
msgstr "База не инициализирована"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:223
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:226
msgid "Routers"
msgstr "Маршрутизаторы"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:225
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:228
msgid "Show all routers"
msgstr "Показать полный ÑпиÑок"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:227
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:230
msgid "Show all routers with full stats"
msgstr "Показать полный ÑпиÑок Ñ Ð¿Ð¾Ð»Ð½Ð¾Ð¹ ÑтатиÑтикой"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:262
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:265
msgid "Network Database Router Statistics"
msgstr "СтатиÑтика маршрутизаторов"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:268
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:282
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:300
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:271
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:285
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:303
msgid "Count"
msgstr "КоличеÑтво"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:282
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:285
msgid "Transports"
msgstr "ТранÑпортный протокол"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:300
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:303
msgid "Country"
msgstr "Страна"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:342
msgid "Our info"
msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ наÑ"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:341
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:344
msgid "Peer info for"
msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ пире"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:345
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:348
msgid "Full entry"
msgstr "Показать полную запиÑÑŒ"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:354
#: ../java/src/net/i2p/router/web/SummaryHelper.java:110
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:600
msgid "Hidden"
msgstr "Скрытый"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:351
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:354
msgid "Updated"
msgstr "Обновленный"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:355
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:358
#, java-format
msgid "{0} ago"
msgstr "{0} назад"
#. shouldnt happen
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:354
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:358
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:357
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:361
msgid "Published"
msgstr "Опубликовано"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:360
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:363
msgid "Address(es)"
msgstr "ÐдреÑ(а)"
# This term intentionally left in English
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:373
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:376
msgid "cost"
msgstr "cost"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:397
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
msgid "Hidden or starting up"
msgstr "Ð’ Ñкрытом режиме или недавно запущен"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:397
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
msgid "SSU"
msgstr "SSU"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:397
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
msgid "SSU with introducers"
msgstr "SSU через поÑредников"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:398
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:403
msgid "NTCP"
msgstr "NTCP"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:398
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:403
msgid "NTCP and SSU"
msgstr "NTCP и SSU"
-#: ../java/src/net/i2p/router/web/NetDbRenderer.java:398
+#: ../java/src/net/i2p/router/web/NetDbRenderer.java:403
msgid "NTCP and SSU with introducers"
msgstr "NTCP и SSU через поÑредников"
@@ -2629,137 +2654,137 @@ msgstr "Ð”Ð»Ñ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð° {0} нет обновлений"
msgid "Update check failed for plugin {0}"
msgstr "Ошибка при проверке Ð½Ð°Ð»Ð¸Ñ‡Ð¸Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¹ Ð´Ð»Ñ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð° {0}"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:138
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:139
msgid "Downloading plugin"
msgstr "ЗагружаетÑÑ Ð¿Ð»Ð°Ð³Ð¸Ð½"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:145
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:146
#: ../java/src/net/i2p/router/web/UpdateHandler.java:179
#, java-format
msgid "{0}B transferred"
msgstr "{0} байт Ñкачано"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:151
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:152
msgid "Plugin downloaded"
msgstr "Плагин загружен"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:156
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:343
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:157
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:344
#, java-format
msgid "Cannot create plugin directory {0}"
msgstr "Ðе удалоÑÑŒ Ñоздать директорию плагина {0}"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:165
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:166
#: ../java/src/net/i2p/router/web/UpdateHandler.java:220
#, java-format
msgid "from {0}"
msgstr "из {0}"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:175
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:176
#, java-format
msgid "Plugin from {0} is corrupt"
msgstr "Загруженный из {0} плагин поврежден"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:186
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:187
#, java-format
msgid "Plugin from {0} does not contain the required configuration file"
msgstr "Загруженный из {0} плагин не Ñодержит необходимого файла наÑтроек"
#. updateStatus("<b>" + "Plugin contains an invalid key" + ' ' + pubkey + ' ' + signer + "</b>");
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:199
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:200
#, java-format
msgid "Plugin from {0} contains an invalid key"
msgstr "Загруженный из {0} плагин Ñодержит некорректный ключ"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:218
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:227
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:236
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:219
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:228
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:237
#, java-format
msgid "Plugin signature verification of {0} failed"
msgstr "Плагин {0} Ñодержит недейÑтвительную подпиÑÑŒ"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:251
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:252
#, java-format
msgid "Plugin from {0} has invalid name or version"
msgstr "Загруженный из {0} плагин имеет некорректное название или верÑию"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:256
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:257
#, java-format
msgid "Plugin {0} has mismatched versions"
msgstr "Плагин {0} Ñодержит неÑовпадающие верÑии"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:264
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:265
#, java-format
msgid "This plugin requires I2P version {0} or higher"
msgstr "Ð”Ð»Ñ Ñтого плагина требуетÑÑ Ð²ÐµÑ€ÑÐ¸Ñ I2P {0} и выше"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:272
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:273
#, java-format
msgid "This plugin requires Java version {0} or higher"
msgstr "Ð”Ð»Ñ Ñтого плагина требуетÑÑ Ð²ÐµÑ€ÑÐ¸Ñ Java {0} и выше"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:280
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:281
msgid "Downloaded plugin is for new installs only, but the plugin is already installed"
msgstr "Загруженный инÑталлÑтор плагина предназначен только Ð´Ð»Ñ Ð¿ÐµÑ€Ð²Ð¾Ð½Ð°Ñ‡Ð°Ð»ÑŒÐ½Ð¾Ð¹ уÑтановки, но такой плагин уже уÑтановлен"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:292
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:293
msgid "Installed plugin does not contain the required configuration file"
msgstr "УÑтановленный плагин не Ñодержит необходимого файла наÑтроек"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:300
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:301
msgid "Signature of downloaded plugin does not match installed plugin"
msgstr "ПодпиÑÑŒ загруженного плагина не Ñовпадает Ñ ÑƒÑтановленным плагином"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:307
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:308
#, java-format
msgid "Downloaded plugin version {0} is not newer than installed plugin"
msgstr "ВерÑÐ¸Ñ Ñкачанного плагина {0} не новее верÑии уже уÑтановленного плагина"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:314
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:315
#, java-format
msgid "Plugin update requires installed plugin version {0} or higher"
msgstr "Ð”Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð° требуетÑÑ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð° {0} и выше"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:321
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:322
#, java-format
msgid "Plugin update requires installed plugin version {0} or lower"
msgstr "Ð”Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð° требуетÑÑ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð° {0} и ниже"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:338
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:339
msgid "Plugin is for upgrades only, but the plugin is not installed"
msgstr "Загруженный инÑталлÑтор плагина предназначен только Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ, но такой плагин ещё не был уÑтановлен"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:351
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:352
#, java-format
msgid "Failed to install plugin in {0}"
msgstr "Ðе удалоÑÑŒ уÑтановить плагин в {0}"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:358
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:359
#, java-format
msgid "Plugin {0} installed, router restart required"
-msgstr "Плагин {0} уÑтановлен, требуетÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° маршрутизатора"
+msgstr "Плагин {0} уÑтановлен, требуетÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑк маршрутизатора"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:360
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:361
#, java-format
msgid "Plugin {0} installed"
msgstr "Плагин {0} уÑтановлен"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:369
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:370
#, java-format
msgid "Plugin {0} installed and started"
msgstr "Плагин {0} уÑтановлен и запущен"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:371
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:372
#, java-format
msgid "Plugin {0} installed but failed to start, check logs"
-msgstr "Плагин {0} уÑтановлен, но при его запуÑке произошел Ñбой, заглÑните в журнал ошибок"
+msgstr "Плагин {0} уÑтановлен, но при его запуÑке произошел Ñбой, заглÑните в логи"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:373
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:374
#, java-format
msgid "Plugin {0} installed but failed to start"
msgstr "Плагин {0} уÑтановлен, но при его запуÑке произошел Ñбой"
-#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:383
+#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:384
#, java-format
msgid "Failed to download plugin from {0}"
msgstr "Ðе удалоÑÑŒ Ñкачать плагин из {0}"
@@ -2987,7 +3012,7 @@ msgstr "Временный бан иÑтекает через {0}"
#: ../java/src/net/i2p/router/web/ShitlistRenderer.java:59
#, java-format
msgid "Banned until restart or in {0}"
-msgstr "Забанен до перезагрузки или иÑÑ‚ÐµÑ‡ÐµÐ½Ð¸Ñ {0}"
+msgstr "Забанен до перезапуÑка или иÑÑ‚ÐµÑ‡ÐµÐ½Ð¸Ñ {0}"
#: ../java/src/net/i2p/router/web/ShitlistRenderer.java:71
msgid "unban now"
@@ -3091,7 +3116,7 @@ msgstr "ÐаÑтройка автозапуÑка клиентов и веб-а
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:56
msgid "I2P Services"
-msgstr "I2P ÑервиÑÑ‹"
+msgstr "СервиÑÑ‹ I2P"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:62
msgid "Manage your I2P hosts file here (I2P domain name resolution)"
@@ -3099,7 +3124,7 @@ msgstr "ЗдеÑÑŒ можно управлÑÑ‚ÑŒ hosts-файлами (един
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:64
msgid "Addressbook"
-msgstr "ÐдреÑÐ½Ð°Ñ ÐšÐ½Ð¸Ð³Ð°"
+msgstr "ÐдреÑÐ½Ð°Ñ ÐºÐ½Ð¸Ð³Ð°"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:68
msgid "Built-in anonymous BitTorrent Client"
@@ -3131,7 +3156,7 @@ msgstr "ÐаÑтройка Маршрутизатора I2P"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:92
msgid "I2P Internals"
-msgstr "I2P ÑвойÑтва"
+msgstr "ÐаÑтройки I2P"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:98
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:374
@@ -3162,11 +3187,11 @@ msgstr "NetDB"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122
msgid "Health Report"
-msgstr "Журналы Ñообщений маршрутизатора"
+msgstr "Логи маршрутизатора"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:124
msgid "Logs"
-msgstr "Журналы"
+msgstr "Логи"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:134
msgid "Graph router performance"
@@ -3188,7 +3213,7 @@ msgstr "Локальные туннели"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:148
#: ../java/strings/Strings.java:62
msgid "I2PTunnel"
-msgstr "Менеджер Туннелей"
+msgstr "Менеджер туннелей"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:159
msgid "I2P Router Help"
@@ -3220,7 +3245,7 @@ msgstr "Ð’Ñ€ÐµÐ¼Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ маршрутизатора Ñ Ð¿Ð¾Ñледне
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190
msgid "Uptime"
-msgstr "Ðптайм"
+msgstr "Ð’Ñ€ÐµÐ¼Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197
msgid "Help with configuring your firewall and router for optimal I2P performance"
@@ -3316,7 +3341,7 @@ msgstr "Очередь"
#: ../java/src/net/i2p/router/web/SummaryHelper.java:101
msgid "ERR-Client Manager I2CP Error - check logs"
-msgstr "ОШИБКР- ошибка менеджера I2CP - заглÑните в журнал ошибок"
+msgstr "ОШИБКР- ошибка менеджера I2CP - заглÑните в логи"
#: ../java/src/net/i2p/router/web/SummaryHelper.java:108
#, java-format
@@ -3603,12 +3628,12 @@ msgstr "Обнаружено повреждение в неподпиÑанно
#: ../java/src/net/i2p/router/web/UnsignedUpdateHandler.java:111
#: ../java/src/net/i2p/router/web/UpdateHandler.java:203
msgid "Restarting"
-msgstr "ПроизводитÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ°"
+msgstr "ПроизводитÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑк"
#: ../java/src/net/i2p/router/web/UnsignedUpdateHandler.java:118
#: ../java/src/net/i2p/router/web/UpdateHandler.java:210
msgid "Click Restart to install"
-msgstr "Перезагрузите I2P-маршрутизатор Ð´Ð»Ñ ÑƒÑтановки"
+msgstr "ПерезапуÑтите I2P-маршрутизатор Ð´Ð»Ñ ÑƒÑтановки"
#: ../java/src/net/i2p/router/web/UnsignedUpdateHandler.java:120
#: ../java/src/net/i2p/router/web/UpdateHandler.java:212
@@ -3925,6 +3950,7 @@ msgstr "наÑтройки Ñети"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:220
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:228
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:217
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:220
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:220
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:220
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/index_jsp.java:223
@@ -3956,6 +3982,7 @@ msgstr "Интервал автообновлениÑ<br> панели (Ñек.)
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:224
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:232
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:221
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:224
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:224
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:224
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/index_jsp.java:227
@@ -4033,7 +4060,7 @@ msgstr "Чем выше Ð´Ð¾Ð»Ñ Ñ‚Ñ€Ð°Ð½Ð·Ð¸Ñ‚Ð½Ð¾Ð³Ð¾ трафика, тем
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:303
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:326
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:320
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:333
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:337
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:373
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:341
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:321
@@ -4180,7 +4207,7 @@ msgstr "Ð’ÐИМÐÐИЕ"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:511
msgid "Changing these settings will restart your router."
-msgstr "Изменение Ñтих наÑтрок повлечет перезагрузку I2P маршрутизатора."
+msgstr "Изменение Ñтих наÑтроек повлечет перезапуÑк I2P маршрутизатора."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:517
msgid "Configuration Help"
@@ -4245,7 +4272,7 @@ msgstr "ПоÑмотреть ÑÑ‚Ð°Ñ‚ÑƒÑ UPnP можно тут."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:554
msgid "UPnP may be enabled or disabled above, but a change requires a router restart to take effect."
-msgstr "UPnP можно включить/выключить в наÑтройках выше. ÐаÑтройка вÑтупит в Ñилу только поÑле перезагрузки I2P-маршрутизатора."
+msgstr "UPnP можно включить/выключить в наÑтройках выше. ÐаÑтройка вÑтупит в Ñилу только поÑле перезапуÑка I2P-маршрутизатора."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:556
msgid "Hostnames entered above will be published in the network database."
@@ -4277,7 +4304,7 @@ msgstr "Возможно Ð’Ñ‹ ÑобÑтвенноручно открыли по
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:574
msgid "If there is an error, the <a href=\"logs.jsp\">logs</a> may also help diagnose the problem."
-msgstr "Ð’ Ñлучае ошибок <a href=\"logs.jsp\">журналы</a> могут помочь диагноÑтировать проблему."
+msgstr "Ð’ Ñлучае ошибок <a href=\"logs.jsp\">логи</a> могут помочь диагноÑтировать проблему."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:578
msgid "Your UDP port does not appear to be firewalled."
@@ -4452,11 +4479,11 @@ msgstr "ПожалуйÑта, наÑтройте адреÑ/порт Ð´Ð»Ñ TCP
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:668
msgid "ERR - Client Manager I2CP Error - check logs"
-msgstr "ОШИБКР- ошибка менеджера I2CP - заглÑните в журнал ошибок"
+msgstr "ОШИБКР- ошибка менеджера I2CP - заглÑните в логи"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:670
msgid "This is usually due to a port 7654 conflict. Check the logs to verify."
-msgstr "Ðта ошибка обычно возникает из-за конфликта порта 7654. ЗаглÑните в журнал ошибок."
+msgstr "Ðта ошибка обычно возникает из-за конфликта порта 7654. ЗаглÑните в логи чтобы убедитьÑÑ."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:672
msgid "Do you have another I2P instance running? Stop the conflicting program and restart I2P."
@@ -4476,7 +4503,7 @@ msgstr "Дополнительные наÑтройки I2P"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:309
msgid "Some changes may require a restart to take effect."
-msgstr "Ð”Ð»Ñ Ð²ÑÑ‚ÑƒÐ¿Ð»ÐµÐ½Ð¸Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… изменений в Ñилу может потребоватьÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° I2P-маршрутизатора."
+msgstr "Ð”Ð»Ñ Ð²ÑÑ‚ÑƒÐ¿Ð»ÐµÐ½Ð¸Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… изменений в Ñилу может потребоватьÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑк I2P-маршрутизатора."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:106
msgid "config clients"
@@ -4501,7 +4528,7 @@ msgstr "Ð”Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ñ€ÑƒÐ³Ð¸Ñ… клиентÑких наÑтро
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:324
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:344
msgid "All changes require restart to take effect."
-msgstr "Ð”Ð»Ñ Ð²ÑÑ‚ÑƒÐ¿Ð»ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½Ñ‘Ð½Ð½Ñ‹Ñ… наÑтроек в Ñилу потребуетÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° маршрутизатора."
+msgstr "Ð”Ð»Ñ Ð²ÑÑ‚ÑƒÐ¿Ð»ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½Ñ‘Ð½Ð½Ñ‹Ñ… наÑтроек в Ñилу потребуетÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑк маршрутизатора."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:336
msgid "WebApp Configuration"
@@ -4573,23 +4600,23 @@ msgstr "Ключ шифрованиÑ"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:107
msgid "config logging"
-msgstr "наÑтройки журнала"
+msgstr "наÑтройки логированиÑ"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:242
msgid "I2P Logging Configuration"
-msgstr "ÐаÑтройки журнала I2P"
+msgstr "ÐаÑтройки Ð»Ð¾Ð³Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ I2P"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:299
msgid "Configure I2P Logging Options"
-msgstr "ÐаÑтройки журнала I2P"
+msgstr "ÐаÑтройка опций Ð»Ð¾Ð³Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ I2P"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:301
msgid "Logging filename"
-msgstr "Файл журнала"
+msgstr "Лог-файл"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:305
msgid "(the symbol '@' will be replaced during log rotation)"
-msgstr "(во Ð²Ñ€ÐµÐ¼Ñ Ñ€Ð¾Ñ‚Ð°Ñ†Ð¸Ð¸ журнала Ñимвол @ будет заменен на номер)"
+msgstr "(во Ð²Ñ€ÐµÐ¼Ñ Ñ€Ð¾Ñ‚Ð°Ñ†Ð¸Ð¸ лога Ñимвол @ будет заменен на номер)"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:307
msgid "Log record format"
@@ -4597,7 +4624,7 @@ msgstr "Формат запиÑи"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:311
msgid "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
-msgstr "(d = дата, c = клаÑÑ, t = тред, p = приоритет, m = Ñообщение)"
+msgstr "(d = дата, c = клаÑÑ, t = поток, p = приоритет, m = Ñообщение)"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:313
msgid "Log date format"
@@ -4609,11 +4636,11 @@ msgstr "(MM = меÑÑц, dd = день, HH = чаÑÑ‹, mm = минуты, ss =
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:319
msgid "Max log file size"
-msgstr "МакÑимальный размер файла журнала"
+msgstr "МакÑимальный размер лог-файла"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:323
msgid "Default log level"
-msgstr "Уровень детальноÑти журнала"
+msgstr "Уровень детализации по умолчанию"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:327
msgid "(DEBUG and INFO are not recommended defaults, as they will drastically slow down your router)"
@@ -4621,7 +4648,11 @@ msgstr "(не рекомендуетÑÑ Ð¸Ñпользовать уровни D
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:329
msgid "Log level overrides"
-msgstr "Дополнительные наÑтройки"
+msgstr "ÐŸÐµÑ€ÐµÐ¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ ÑƒÑ€Ð¾Ð²Ð½Ñ Ð»Ð¾Ð³Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:333
+msgid "New override"
+msgstr "Ðовое переопределение"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:106
msgid "config peers"
@@ -4690,7 +4721,7 @@ msgstr "ЕÑли маршрутизатор должен быть выключе
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:298
msgid "If you want the router to restart itself after shutting down, you can choose one of the following."
-msgstr "Иногда, Вам нужно перегрузить маршрутизатор (например, поÑле Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð±Ð°Ð·Ð¾Ð²Ñ‹Ñ… наÑтроек, которые ÑчитываютÑÑ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÐ¼ только во Ð²Ñ€ÐµÐ¼Ñ Ð·Ð°Ð¿ÑƒÑка). Ð’ Ñтом Ñлучае, Вам доÑтупны два варианта. ÐŸÐ»Ð°Ð²Ð½Ð°Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° займет неÑколько минут (но зато пиры, иÑпользующие Ваш маршрутизатор, будут Вам благодарны за терпение). ЕÑли Ð’Ñ‹ не можете ждать, выбирайте немедленную перезагрузку. Ð’ Ñлучае немедленной перезагрузки маршрутизатор запуÑтитÑÑ Ñ‡ÐµÑ€ÐµÐ· одну минуту."
+msgstr "Иногда, Вам нужно перегрузить маршрутизатор (например, поÑле Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð±Ð°Ð·Ð¾Ð²Ñ‹Ñ… наÑтроек, которые ÑчитываютÑÑ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÐ¼ только во Ð²Ñ€ÐµÐ¼Ñ Ð·Ð°Ð¿ÑƒÑка). Ð’ Ñтом Ñлучае, Вам доÑтупны два варианта. Плавный перезапуÑк займет неÑколько минут (но зато пиры, иÑпользующие Ваш маршрутизатор, будут Вам благодарны за терпение). ЕÑли Ð’Ñ‹ не можете ждать, выбирайте немедленный перезапуÑк. Ð’ Ñлучае немедленного перезапуÑка маршрутизатор запуÑтитÑÑ Ñ‡ÐµÑ€ÐµÐ· одну минуту."
# This string intentionally left blank
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:300
@@ -4753,7 +4784,7 @@ msgstr "ПроÑмотр очереди заданий"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:352
msgid "At times, it may be helpful to debug I2P by getting a thread dump. To do so, please select the following option and review the thread dumped to <a href=\"logs.jsp#servicelogs\">wrapper.log</a>."
-msgstr "Ð’ некоторых ÑлучаÑÑ… Ð´Ð»Ñ Ð¾Ñ‚Ð»Ð°Ð´ÐºÐ¸ может пригодитьÑÑ ÑпиÑок ÑоÑтоÑний тредов I2P-маршутизатора. Ð”Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ñ‚Ð°ÐºÐ¾Ð³Ð¾ ÑпиÑка нажмите Ñту кнопку. СпиÑок будет Ñохранен в файле <a href=\"logs.jsp#servicelogs\">wrapper.log</a>."
+msgstr "Ð’ некоторых ÑлучаÑÑ… Ð´Ð»Ñ Ð¾Ñ‚Ð»Ð°Ð´ÐºÐ¸ может пригодитьÑÑ ÑпиÑок ÑоÑтоÑний потоков I2P-маршутизатора. Ð”Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ñ‚Ð°ÐºÐ¾Ð³Ð¾ ÑпиÑка нажмите Ñту кнопку. СпиÑок будет Ñохранен в файле <a href=\"logs.jsp#servicelogs\">wrapper.log</a>."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:358
msgid "Launch browser on router startup?"
@@ -4781,7 +4812,7 @@ msgstr "Включить полную ÑтатиÑтику?"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:309
msgid "change requires restart to take effect"
-msgstr "Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²ÑтупÑÑ‚ в Ñилу только поÑле перезагрузки маршрутизатора"
+msgstr "Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²ÑтупÑÑ‚ в Ñилу только поÑле перезапуÑка маршрутизатора"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:311
msgid "Stat file"
@@ -4798,7 +4829,7 @@ msgstr "переключить вÑе"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:328
msgid "Log"
-msgstr "Журнал"
+msgstr "Лог"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:330
msgid "Graph"
@@ -4843,7 +4874,7 @@ msgstr "ÐаÑтройки зондирующих туннелей Ñохран
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:335
msgid "Client tunnel changes are temporary and are not saved."
-msgstr "ÐаÑтройки клиентÑких туннелей нигде не ÑохранÑÑŽÑ‚ÑÑ Ð¸ дейÑтвуют только до перезагрузки."
+msgstr "ÐаÑтройки клиентÑких туннелей нигде не ÑохранÑÑŽÑ‚ÑÑ Ð¸ дейÑтвуют только до перезапуÑка."
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:337
msgid "To make permanent client tunnel changes see the"
@@ -4991,11 +5022,11 @@ msgstr "Очередь заданий маршрутизатора I2P"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:105
msgid "logs"
-msgstr "журналы"
+msgstr "логи"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:227
msgid "I2P Router Logs"
-msgstr "Журналы маршрутизатора I2P"
+msgstr "Логи маршрутизатора I2P"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:229
msgid "I2P Version & Running Environment"
@@ -5011,15 +5042,15 @@ msgstr "ПожалуйÑта, добавлÑйте Ñту информацию
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:274
msgid "Critical Logs"
-msgstr "Журнал критичеÑких ошибок"
+msgstr "Логи критичеÑких ошибок"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:278
msgid "Router Logs"
-msgstr "Журнал маршрутизатора"
+msgstr "Логи маршрутизатора"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:284
msgid "Service (Wrapper) Logs"
-msgstr "Журнал Ñлужбы (wrapper)"
+msgstr "Логи Ñлужбы (wrapper)"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:105
msgid "network database summary"
diff --git a/apps/susidns/locale/messages_de.po b/apps/susidns/locale/messages_de.po
index ca2c4c74dd236aaacaa0ee4303a4764de2e51885..0b5d7936a825e94fa6665e0bf644f152f2e93f12 100644
--- 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\">Ü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\">Ü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!"
diff --git a/build.xml b/build.xml
index af467498b89d8cd69aec3d7763a31753c87b4d87..45d4344e81decad598145dc2980046ed24d2027d 100644
--- 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"" />
+ </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 -->
diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java
index fd43c87fcda50fb253256cef03325345b23a2923..f56cef3acf3f0c75b5cd2b8b0ab1b8aa0b77ecbc 100644
--- 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);
diff --git a/core/java/src/net/i2p/client/I2PClient.java b/core/java/src/net/i2p/client/I2PClient.java
index 941549d5372bf453f949fd7af1c62b9a22079f3f..adc03bb273d507b941a15434f8c1841a5e95b8e7 100644
--- 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;
diff --git a/core/java/src/net/i2p/client/I2PClientImpl.java b/core/java/src/net/i2p/client/I2PClientImpl.java
index 5b1b44867d4e48440416e8220f753d48211fd089..d0147f0d77658d03ddc6e6d2411f979e9becd500 100644
--- 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
diff --git a/core/java/src/net/i2p/client/I2PSessionImpl.java b/core/java/src/net/i2p/client/I2PSessionImpl.java
index 65636a30bb48ab5aba26f1ff51279ef8f871e582..cd60b60cc014933e3664227226d6798a2a5fecbc 100644
--- 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; }
diff --git a/core/java/src/net/i2p/client/I2PSessionImpl2.java b/core/java/src/net/i2p/client/I2PSessionImpl2.java
index 62b0d3d08b9fcd1d398ad5c9fe2628881b7b7513..f0000b68cb4302cdf079b01007ef7463f70b0743 100644
--- 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 } );
diff --git a/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java b/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java
index c0533b1fff24a466102abad0cbec70342c3facc3..837bc2dbc2de07b7e8567a80a429a14244cc5413 100644
--- 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
diff --git a/core/java/src/net/i2p/client/naming/LookupDest.java b/core/java/src/net/i2p/client/naming/LookupDest.java
index 2bbb2eeb6a2a5550fd5260a54366d2d879954e5b..c90b4a6738dc87ff1b87c83d057474ab2d6987cf 100644
--- 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());
}
}
diff --git a/core/java/src/net/i2p/util/ByteCache.java b/core/java/src/net/i2p/util/ByteCache.java
index d05327744cdb58569dba138e47002002a8686959..a95b33de1f50eeafd314d7e0df3aa2fd8cab7b39 100644
--- 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;
diff --git a/core/java/src/net/i2p/util/SecureFileOutputStream.java b/core/java/src/net/i2p/util/SecureFileOutputStream.java
index 3df1f14a58e82fc35baf345036868150599ca2b6..01c6eba718976d2806cb04f8890b0c93ee53b7bd 100644
--- 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);
diff --git a/debian/README.txt b/debian/README.txt
index 683d506239054ed1985ee9fe63fdec59e4e2862b..e2b38b54299ea9b8fe79f85676d5e46fc04a9451 100644
--- 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
diff --git a/debian/changelog b/debian/changelog
index 1cc890004a18ca779c8d0076f1a561bdb55fd1da..101546dc986d1fb661e4c37b4f02522fce42e040 100644
--- 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...
diff --git a/debian/conffiles b/debian/conffiles
new file mode 100644
index 0000000000000000000000000000000000000000..0c0895bbca783f809f59ba6f25e3690860c8a9d6
--- /dev/null
+++ 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
diff --git a/debian/control b/debian/control
index 1813b75594f4cfa5ad2a14151a64d9bd09ab81d0..fbe7deb155922ced3bb003eb76c3cc271586ab4a 100644
--- 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
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index 0b434e17509e2d271b609b105bf71a167066d34a..0000000000000000000000000000000000000000
--- a/debian/copyright
+++ /dev/null
@@ -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.
diff --git a/debian/copyright.part1 b/debian/copyright.part1
new file mode 100644
index 0000000000000000000000000000000000000000..009410c0d046bf513109c4e3b4c7110fe8a24fb0
--- /dev/null
+++ 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
+
diff --git a/debian/makerepo.sh b/debian/makerepo.sh
new file mode 100755
index 0000000000000000000000000000000000000000..64d696966086aaa78e26b048af64bba3d83ad1a7
--- /dev/null
+++ 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}.
diff --git a/debian/rules b/debian/rules
index e9d457d81f8eec03cfe5c5cf87c5e085c51c0593..bf63b845ca3310ab2bcb4a089afde642c7ccd334 100755
--- 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/
diff --git a/debian/scripts/init b/debian/scripts/init
index e196a9404d0cfb033ac28961895bb16fea3376fc..e877bfd8a852f8cefa1ef8a2e17510e482fa40eb 100755
--- 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
diff --git a/debian/scripts/postinst b/debian/scripts/postinst
index 6d76f2f0cf82935ed0c4f189109728473637203c..f6d7c034b5959f574ecd73ada70298c6948c6be5 100755
--- 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
diff --git a/debian/scripts/postrm b/debian/scripts/postrm
index a768a036c3a812c5a08beab68a43ba9b7d47335a..83f06ce7812d8126e111fc574b54a3e9e3fc272b 100755
--- 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
diff --git a/debian/scripts/prerm b/debian/scripts/prerm
index 7fe94712189e0879a9ece04ebc96ead42cefb947..1777a4ecbaff77aa6aed273674d374c595aff723 100755
--- a/debian/scripts/prerm
+++ b/debian/scripts/prerm
@@ -1,17 +1,15 @@
#!/bin/sh
-/etc/init.d/i2p stop
+set -e
-# 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
+invoke-rc.d i2p stop
-# /etc/rc*.d/*i2p files
-update-rc.d -f i2p remove
+# stuff in /tmp
+TMPDIR=/tmp
+rm -f ${TMPDIR}/wrapper.log ${TMPDIR}/wrapper.log.1 ${TMPDIR}/wrapper.log.2 ${TMPDIR}/i2p.pid ${TMPDIR}/routerjvm.pid ${TMPDIR}/router.ping
-# 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
diff --git a/history.txt b/history.txt
index c867ccc16cb7ca86608d7aa6a8bb7cb4fdf214ef..c00359274ec9b063ad17f52fc36b48dde68b4a39 100644
--- 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
diff --git a/installer/install.xml b/installer/install.xml
index 65f56dbc4d03cce65099b25cc924df966a36c8d4..e71b95f63e47d2a3218dfdb6797cff063e9b15b5 100644
--- 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>
diff --git a/installer/resources/eepsite.help/help/index_de.html b/installer/resources/eepsite.help/help/index_de.html
index 7c57669b3883585864002fa9821c09376178fb86..6f2814cc30aa0af30720cd3afa9d11233325a4fc 100644
--- 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
diff --git a/installer/resources/initialNews.xml b/installer/resources/initialNews.xml
index 05e4436e0768a06897a6a959331c01c29ddbd3d2..a89bb4f4651d081a3b5172cdacb6d83bad1ad587 100644
--- 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ährend I2P startet und weitere I2P Router findet.
+<b>Willkommen im I2P!</b>
+Hab noch <b>etwas Geduld</b>, wä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>¡Felicidades!, has instalado el enrutador I2P con éxito.</li></ul></h4>
+<p>
+<b>¡Bienvenido a I2P!</b><br>
+¡Ten todavía <b>paciencia</b> mientras I2P esté arrancando y encontrando otros enrutadores I2P!
+</p>
+<p>
+Este es el momento ideal para adaptar tu <b>configuración de ancho de banda</b> en la
+<a href="config.jsp">página de configuración</a>.
+</p>
+<p>
+En cuanto veas a la izquierda una conexión llamada "shared clients", puedes visitar nuestros <a href="http://www.i2p2.i2p/faq.html">FAQ</a>.
+</p>
+<p>
+¡Coné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>
diff --git a/installer/resources/man/eepget.1 b/installer/resources/man/eepget.1
new file mode 100644
index 0000000000000000000000000000000000000000..d8509d4c6185f8e48a9a4d56ad2282c5f17248f3
--- /dev/null
+++ 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)
diff --git a/installer/resources/man/i2prouter.1 b/installer/resources/man/i2prouter.1
new file mode 100644
index 0000000000000000000000000000000000000000..e1ba8f6232ac720c15ff2e2c1848a14a7499f85d
--- /dev/null
+++ 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.
diff --git a/installer/resources/news.xml b/installer/resources/news.xml
index 9e754a9e467b47d63396a3a6c79d28a630eca751..91cdd52a97fc906b2811260be2c199d3f0fb2732 100644
--- 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>,
diff --git a/installer/resources/package-lists/java/package-list b/installer/resources/package-lists/java/package-list
new file mode 100644
index 0000000000000000000000000000000000000000..3e918cda54a2df3c2242c6e964a39e1915b7ab55
--- /dev/null
+++ 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
diff --git a/installer/resources/package-lists/jetty/package-list b/installer/resources/package-lists/jetty/package-list
new file mode 100644
index 0000000000000000000000000000000000000000..9e991e7daf1236a80101fddd582ff533f654be81
--- /dev/null
+++ 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
diff --git a/installer/resources/package-lists/jrobin/package-list b/installer/resources/package-lists/jrobin/package-list
new file mode 100644
index 0000000000000000000000000000000000000000..35d275684c723a3b3409902b9091cbd66a6120bd
--- /dev/null
+++ b/installer/resources/package-lists/jrobin/package-list
@@ -0,0 +1,2 @@
+org.jrobin.core
+org.jrobin.graph
diff --git a/installer/resources/proxy/ahelper-conflict-header_de.ht b/installer/resources/proxy/ahelper-conflict-header_de.ht
new file mode 100644
index 0000000000000000000000000000000000000000..f741d82d3229fc35d9f936723f06841a4489cdcd
--- /dev/null
+++ 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>
diff --git a/installer/resources/proxy/denied-header_de.ht b/installer/resources/proxy/denied-header_de.ht
new file mode 100644
index 0000000000000000000000000000000000000000..56e2c32cce88df96f83cbda9c465e2195bbb3662
--- /dev/null
+++ 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>
diff --git a/installer/resources/proxy/dnf-header_de.ht b/installer/resources/proxy/dnf-header_de.ht
new file mode 100644
index 0000000000000000000000000000000000000000..80be88ff98696817ad510897cca86c6763893b44
--- /dev/null
+++ 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>
diff --git a/installer/resources/proxy/dnfb-header_de.ht b/installer/resources/proxy/dnfb-header_de.ht
new file mode 100644
index 0000000000000000000000000000000000000000..104ea11db4422b2e44667726e3ae166f45d454b0
--- /dev/null
+++ 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>
diff --git a/installer/resources/proxy/dnfh-header_de.ht b/installer/resources/proxy/dnfh-header_de.ht
new file mode 100644
index 0000000000000000000000000000000000000000..e89b2aa0c17212d1de97298e8a0e3dd6a6149d48
--- /dev/null
+++ 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>
diff --git a/installer/resources/proxy/dnfp-header_de.ht b/installer/resources/proxy/dnfp-header_de.ht
new file mode 100644
index 0000000000000000000000000000000000000000..416782a5c9ab0349e11b5747cfbb896fa1c239a6
--- /dev/null
+++ 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>
diff --git a/installer/resources/proxy/localhost-header_de.ht b/installer/resources/proxy/localhost-header_de.ht
new file mode 100644
index 0000000000000000000000000000000000000000..1a3473f093ef99a0e905cfaad6584ff21cb118f0
--- /dev/null
+++ 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>
diff --git a/installer/resources/proxy/noproxy-header_de.ht b/installer/resources/proxy/noproxy-header_de.ht
new file mode 100644
index 0000000000000000000000000000000000000000..65b2a59f04a7be43e2c3d70e0c094a306b94dd75
--- /dev/null
+++ 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>
diff --git a/installer/resources/proxy/protocol-header_de.ht b/installer/resources/proxy/protocol-header_de.ht
new file mode 100644
index 0000000000000000000000000000000000000000..a7333f63c589ffd0c600176fa8009a96e075e79f
--- /dev/null
+++ 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>
diff --git a/installer/resources/readme/readme.html b/installer/resources/readme/readme.html
index 5f944fa65864b9d6c85716e099556eb5bac78d5d..2a3596f01c3d5a5c6876830d60cdbb2db603bc60 100644
--- 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çais" alt="Français"></a>
+ <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Español" alt="Españ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
diff --git a/installer/resources/readme/readme_de.html b/installer/resources/readme/readme_de.html
index 32a65c7fdf3d0c8ebf04b8a6f7360ab48d2d1ed5..692bbb729ab7f72e248efb0b3f7da62cef083332 100644
--- 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çais" alt="Franç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>
-<div class="welcome"><h2>Willkommen zu I2P!</h2></div>
-<p>Wenn Du gerade I2P gestartet hast, sollten die "Active:" Zahlen links in den nä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>
-<ul>
- <li><b>"Eepsites" besuchen</b> - In I2P sind anonym gehostete Websites -
- Stelle Deinen Browser so ein, über den <b>HTTP proxy: 127.0.0.1 port 4444</b> zu surfen, dann besuche eine Eepsite:<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ür Eepsites</li>
- <li><a href="http://ugha.i2p/">ugha.i2p</a>: Ugha's Eepsite, ein ö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>
- <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
- 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ü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>
-</ul>
-
-<h2>Willst Du Deine eigene Eepsite?</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
-<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
- 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ügbar. Nach dem Start des <a href="/i2ptunnel/">Eepsite tunnels</a>
- der darauf zeigt ist Deine Eepsite für Andere verfügbar.
- Detailierte Instruktionen zum Start Deiner eigenen Eepsite sind auf
- <a href="http://127.0.0.1:7658/">Deine temporäre Eepsite</a>.
-</p>
-
-<h2><a name="trouble">Troubleshooting</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 öffnen um
- für bessere Verbindung zu sorgen. Den bei dir benutzten I2P 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.
- Vielleicht mö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 />
</div>
+<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çais" alt="Français"></a> <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Español" alt="Españ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 im I2P!</h2></div>
+<p>Wenn Du I2P gerade gestartet hast, sollten die "Aktiv:"-Zahlen links in den nä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>"Eepseiten" besuchen</b> - In I2P gibt es anonym gehostete Websites:
+ Konfiguriere Deinen Browser, ü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 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ür Eepseiten</li>
+ <li><a href="http://ugha.i2p/">ugha.i2p</a>: Ugha's Eepseite, ein ö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 viele andere Eepseiten - folge einfach den Links, die du findest,
+ setze Lesezeichen fü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>-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ür Postmans Email-Service.
+ <br>Oder probier unser neues serverloses und Ende-zu-Ende-verschlüsseltes Emailsystem <a href="http://tjgidoycrw6s3guetge3kvrvynppqjmvqsosmtbmgqasa6vmsf6a.b32.i2p/">I2P-Bote</a> (mit Webinterface) aus, welches als Plugin erhä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 Eepseite?</h2>
+
+<p>Das I2P-Paket beinhaltet Software, die es Dir ermö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 im Verzeichnis <code>eepsite/docroot/</code> (oder jedes
+ Standard-JSP/Servlet <code>.war</code> unter <code>eepsite/webapps</code>,
+ CGI Scripte unter <code>eepsite/cgi-bin</code>) und schon sind sie
+ verfügbar. Nach dem Starten des <a href="/i2ptunnel/">Eepseiten-Tunnels</a>,
+ der darauf zeigt, ist Deine Eepseite für andere verfügbar.
+ Detailierte Instruktionen zum Start Deiner eigenen Eepseite findest Du auf
+ <a href="http://127.0.0.1:7658/">Deiner temporären Eepseite</a>.
+</p>
+
+<h2><a name="trouble">Problembehebung</a></h2>
+
+<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 öffnen, um
+ fü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 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öchtest Du auch die Informationen lesen, die auf der
+ <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>
diff --git a/installer/resources/readme/readme_es.html b/installer/resources/readme/readme_es.html
new file mode 100644
index 0000000000000000000000000000000000000000..73c8e473cd18576490f4ba049cc2ef4b6a3d6ff0
--- /dev/null
+++ 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çais" alt="Français"></a> <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Español" alt="Españ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>¡Bienvenido a I2P!</h2></div>
+<p>Si acabas de arrancar I2P los números a la derecha de "Active:" deberían subir en los próximos minutos y luego verás allí una Destinación llamada "shared clients" <br>(si no, <a href="#trouble">¡mira abajo!</a>) Apenas aparezca esto, puedes:</p>
+<ul>
+ <li><b>visitar páginas I2P ("Eepsites")</b> - En I2P hay páginas web anónimas:
+ Configura tu navegador web para usar el <b>proxy HTTP: 127.0.0.1 puerto 4444</b>, luego visita una página I2P:<br>
+ <ul class="links">
+ <li><a href="http://forum.i2p/">forum.i2p</a>: Conexión segura y anó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ó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ágina de búsqueda para páginas I2P</li>
+ <li><a href="http://ugha.i2p/">ugha.i2p</a>: Página de Ugha; un wiki pú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ónimo</li>
+ </ul><br />
+ Hay muchas páginas I2P más - simplemente ¡sigue los enlaces que encuentres, pon marcadores para tus favoritos y visítalos frecuentemente!</
+ li><br />
+ <li class="tidylist"><b>navegar en internet</b> - En I2P existe un HTTP-"Outproxy". Para poder usarlo, puedes también utilizar el proxy HTTP en el puerto 4444 - Si configuras tu navegador web para usar este proxy, puedes visitar las páginas web de forma anónima. El tráfico será enrutado através de la red I2P.</li>
+ <li class="tidylist"><b>intercambiar datos</b> - Hay una<a href="i2psnark/">Adaptación</a> de la aplicaciö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ónico anónimo</b> - Postman creó un sistema de correo electrónico que es compatible con las aplicaciones de correo comunes (POP3/SMTP), el cual permite enviar correos electró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ónimo de correo que se abre en el navegador web. Ya está configurado para el servicio de Postman.<br>También te recomendamos nuestro nuevo sistema de correo electró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ónimo</b> - Lanza tu cliente IRC preferido y conéctate con el servidor anónimo en
+ <b>127.0.0.1 puerto 6668</b>. Esto te llevará a uno de dos servidores anónimos de IRC
+ - y ni tu ni los demás usuarios sabrán quien es el otro, ni siquiera el administrador del servidor.</li>
+ <li class="tidylist"><b>blog anónimo</b> - ¡Prueba <a href="http://syndie.i2p2.de/">Syndie</a>!</li>
+ <li class="tidylist">y mucho más</li>
+</ul>
+
+<h2>¿Quieres tener tu propia página I2P?</h2>
+
+<p>El paquete I2P contiene programas que te facilitan manejar tu propia pá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á disponible tu página.
+ Después del arranque del <a href="/i2ptunnel/">túnel de la página I2P</a>,
+ que enlaza con tu servidor, tu página I2P está disponible para otros.
+ Instrucciones más detalladas sobre cómo lanzar tu página I2P puedes encontrar
+ en <a href="http://127.0.0.1:7658/">tu página I2P temporal</a>.
+</p>
+
+<h2><a name="trouble">Problemas</a></h2>
+
+<p>¡Ten paciencia!, despué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és de treinta minutos el número de tus conexiones activas (¡vea al lado izquierdo, debajo de "participantes"!)
+ aún sigue menor que diez, debería ver si el puerto que usa I2P está abierto en tu cortafuegos, para que tengas una conexión mejor.
+ El puerto que usa tu enrutador I2P (un puerto aleatorio escogido a la hora de la instalación) puedes ver en
+ la <a href="config.jsp">Página de configuración</a>.
+ Si no puedes acceder a ninguna página I2P (ni siquiera a
+ <a href="http://www.i2p2.i2p/index_de.html">www.i2p2.i2p</a>), ¡asegúrate de que tu navegador esté usando el proxy
+ 127.0.0.1 puerto 4444!
+ Quizás quieras leer la información disponible en la
+ <a href="http://www.i2p2.i2p/index_de.html">Pá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é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án conectados.)
+ Si aún no tienes acceso a I2P, tambié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ónima.</p><hr />
+</div>
diff --git a/installer/resources/readme/readme_fr.html b/installer/resources/readme/readme_fr.html
index ff08dac398adde6977b820016ac60d7d9efab25a..ac44bc60f38c04d00b00d4313e9aa71d0bc73a35 100644
--- a/installer/resources/readme/readme_fr.html
+++ b/installer/resources/readme/readme_fr.html
@@ -1,43 +1,46 @@
<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çais" alt="Franç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>
-<div class="welcome"><h2>Bienvenu a I2P!</h2></div>
-<p>Si vous venez juste de lancer I2P, les chiffres sur la gauche à coté de Active devraient commencer à augmenter dans les prochaines minutes et vous verrez un "Shared client" en destination locale listé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ébergés - dites à 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>
- <ul class="links">
- <li><a href="http://forum.i2p/">forum.i2p</a>: une connection sécurisée et anonyme vers <a href="http://forum.i2p2.de/">forum.i2p2.de</a></li>
- <li><a href="http://www.i2p2.i2p/index_fr.html">www.i2p2.i2p</a> et le miroir <a href="http://i2p-projekt.i2p/index_fr.html">i2p-projekt.i2p</a>:
- connections sécurisées et anonyme vers <a href="http://www.i2p2.de/index_fr.html">www.i2p2.de</a></li>
- <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 é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://paste.i2p2.i2p">paste.i2p2.i2p</a>: Pastebin anonyme</li>
- <br>
- </ul>
- Il y a bien plus d'eepsites - suivez juste les liens au départ de ceux sur lesquels vous êtes, mettez-les dans vos favoris et visitez-les souvent!</li><br>
- <li class="tidylist"><b>Parcourez le web</b> - Il y a pour l'instant un outproxy HTTP sur I2P attaché à votre propre proxy HTTP sur le port 4444 - vous devez simplement configurer le proxy de votre navigateur pour l'utiliser (comme expliqué ci-dessus) et aller sur n'importe quel URL normale - vos requêtes seront relayées par le réseau i2p.</li>
- <li class="tidylist"><b>Transfer de fichiers</b> - Il y a un <a href="i2psnark/">port</a> intégré 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éé un sytè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 à partir de l'internet normal! Créez-vous un compte à <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é sur l'anonymat qui est configuré pour accéder aux services email de postman.</li>
- <li class="tidylist"><b>Chatter de maniè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é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>
-</ul>
-
-<h2>Vous voulez votre propre eepsite?</h2>
-
-<p>Nous fournissons de base quelques logiciels pour vous permettre de créer votre propre eepsite - une instance
-<a href="http://jetty.mortbay.org/">Jetty</a>, qui écoute sur
-<a href="http://127.0.0.1:7658/">http://127.0.0.1:7658/</a>. Placer simplement vos fichiers dans le répertoire <code>eepsite/docroot/</code> (ou placez n'importe quel fichier JSP/Servlet standard <code>.war</code>) dans eepsite/webapps, ou script CGI standard dans <code>eepsite/cgi-bin</code>) et ils apparaitront. Après avoir démarré un <a href="/i2ptunnel/">tunnel pour votre eepsite</a> (le tunnel doit pointer sur l'adresse locale du eepsite), votre eepsite sera visible pour les autes. Des instructions plus détaillées pour créer un eepsite se trouvent sur <a href="http://127.0.0.1:7658/">Votre eepsite temporaire</a>.
-</p>
-
-<h2><a name="trouble">Dépannage</a></h2>
-
-<p>Soyez patient - i2p peut s'avérer lent à démarrer la première fois car il recherche des pairs. Si, après 30 minutes, votre Actives: connecté/récent compte moins de 10 pairs connectés, vous devez ouvrir le port 8887 sur votre pare-feu pour avoir une meilleure connection. Si vous ne pouvez accéder à aucun eepsite (même <a href="http://www.i2p2.i2p/index_fr.html">www.i2p2.i2p</a>), soyez sûr que votre navigateur utilise bien le proxy 127.0.0.1 sur le port 4444. Vous pouvez aussi faire part de votre dé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és).</p><hr />
</div>
+<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çais" alt="Français"></a> <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Español" alt="Españ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 sur I2P!</h2></div>
+<p>Si vous venez juste de lancer I2P, les chiffres sur la gauche à coté de Active devraient commencer à augmenter dans les prochaines minutes et vous verrez un "Shared client" en destination locale listé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ébergés - dites à 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>
+ <ul class="links">
+ <li><a href="http://forum.i2p/">forum.i2p</a>: une connection sécurisée et anonyme vers <a href="http://forum.i2p2.de/">forum.i2p2.de</a></li>
+ <li><a href="http://www.i2p2.i2p/index_fr.html">www.i2p2.i2p</a> et le miroir <a href="http://i2p-projekt.i2p/index_fr.html">i2p-projekt.i2p</a>:
+ connections sécurisées et anonyme vers <a href="http://www.i2p2.de/index_fr.html">www.i2p2.de</a></li>
+ <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 é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 de software (I2PFox, iMule, I2P-Messenger, ...) et informations à propos de I2P<br></li>
+ <li><a href="http://paste.i2p2.i2p">paste.i2p2.i2p</a>: Pastebin anonyme</li>
+ <br>
+ </ul>
+ Il y a bien plus d'eepsites - suivez juste les liens au départ de ceux sur lesquels vous êtes, mettez-les dans vos favoris et visitez-les souvent!</li><br>
+ <li class="tidylist"><b>Parcourez le web</b> - Il y a pour l'instant un outproxy HTTP sur I2P attaché à votre propre proxy HTTP sur le port 4444 - vous devez simplement configurer le proxy de votre navigateur pour l'utiliser (comme expliqué ci-dessus) et aller sur n'importe quel URL normale - vos requêtes seront relayées par le réseau i2p.</li>
+ <li class="tidylist"><b>Transfer de fichiers</b> - Il y a un <a href="i2psnark/">port</a> intégré 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éé un sytè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 à partir de l'internet normal! Créez-vous un compte à <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é sur l'anonymat qui est configuré pour accéder aux services email de postman.
+ <br>Alternativement, vous pouvez essayer le nouveau système de courrier sans serveur et crypté 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è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é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>
+</ul>
+
+<h2>Vous voulez votre propre eepsite?</h2>
+
+<p>Nous fournissons de base quelques logiciels pour vous permettre de créer votre propre eepsite - une instance
+<a href="http://jetty.mortbay.org/">Jetty</a>, qui écoute sur
+<a href="http://127.0.0.1:7658/">http://127.0.0.1:7658/</a>. Placer simplement vos fichiers dans le répertoire <code>eepsite/docroot/</code> (ou placez n'importe quel fichier JSP/Servlet standard <code>.war</code>) dans eepsite/webapps, ou script CGI standard dans <code>eepsite/cgi-bin</code>) et ils apparaitront. Après avoir démarré un <a href="/i2ptunnel/">tunnel pour votre eepsite</a> (le tunnel doit pointer sur l'adresse locale du eepsite), votre eepsite sera visible pour les autes. Des instructions plus détaillées pour créer un eepsite se trouvent sur <a href="http://127.0.0.1:7658/">Votre eepsite temporaire</a>.
+</p>
+
+<h2><a name="trouble">Dépannage</a></h2>
+
+<p>Soyez patient - i2p peut s'avérer lent à démarrer la première fois car il recherche des pairs. Si, après 30 minutes, votre Actives: connecté/récent compte moins de 10 pairs connectés, vous devez ouvrir le port 8887 sur votre pare-feu pour avoir une meilleure connection. Si vous ne pouvez accéder à aucun eepsite (même <a href="http://www.i2p2.i2p/index_fr.html">www.i2p2.i2p</a>), soyez sûr que votre navigateur utilise bien le proxy 127.0.0.1 sur le port 4444. Vous pouvez aussi faire part de votre dé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és).</p><hr />
+</div>
diff --git a/installer/resources/readme/readme_nl.html b/installer/resources/readme/readme_nl.html
index f015c03a14f748989300c1f9a7fe3f0771778b90..20ad2e0958ce225654b6e11ebb5f3e83e2351300 100644
--- 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çais" alt="Franç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çais" alt="Français"></a> <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Español" alt="Españ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>
diff --git a/installer/resources/readme/readme_ru.html b/installer/resources/readme/readme_ru.html
index 0a181f6f3f8b29e0a28b61d554bdd6ef5b643c8e..5f948830346839934cd4ec2c8ec5bb1e43a9f4ce 100644
--- a/installer/resources/readme/readme_ru.html
+++ b/installer/resources/readme/readme_ru.html
@@ -1,65 +1,67 @@
<div lang="ru">
-<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çais" alt="Franç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>
-<div class="welcome"><h2>Добро пожаловать в I2P!</h2></div>
-<p>Когда Ð’Ñ‹ запуÑкаете I2P впервые — чиÑла в графе «Ðктивные» (Ñлева) начнут раÑти поÑтепенно, Ñто может занÑÑ‚ÑŒ неÑколько минут. Затем в ÑпиÑке «Локальные туннели» поÑвитÑÑ Ð·Ð°Ð¿Ð¸ÑÑŒ «коллективные клиенты» (еÑли Ñтого не ÑлучилоÑÑŒ, <a href="#trouble">Ñм. «уÑтранение неполадок»</a>).
-
-<p>ПоÑле поÑÐ²Ð»ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿Ð¸Ñи «коллективные клиенты» Ð’Ñ‹ можете:</p>
-<ul>
-
- <li><b>ПроÑматривать I2P-Ñайты</b> (веб-Ñайты хоÑÑ‚ÑщиеÑÑ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾ внутри I2P Ñети). Ð”Ð»Ñ Ñтого наÑтройте в Вашем браузере <b>HTTP прокÑи-Ñервер 127.0.0.1 порт 4444</b>. С Ñтими наÑтройками попробуйте зайти на I2P-Ñайты по ÑÑылкам ниже:<br>
-
- <ul class="links">
- <li><a href="http://forum.i2p/">forum.i2p</a> — безопаÑное и анонимное зеркало Ð´Ð»Ñ Ñ„Ð¾Ñ€ÑƒÐ¼Ð° <a href="http://forum.i2p2.de/">forum.i2p2.de</a></li>
- <li><a href="http://www.i2p2.i2p/">www.i2p2.i2p</a> или <a href="http://i2p-projekt.i2p">i2p-projekt.i2p</a> — безопаÑное и анонимное зеркало Ð´Ð»Ñ <a href="http://www.i2p2.de/">www.i2p2.de</a></li>
- <li><a href="http://eepsites.i2p/">eepsites.i2p</a> — Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð°Ñ Ð¿Ð¾Ð¸ÑÐºÐ¾Ð²Ð°Ñ ÑиÑтема по I2P-Ñайтам</li>
- <li><a href="http://ugha.i2p/">ugha.i2p</a> — I2P-вики, которую может редактировать любой пользователь, Ð¿Ð»ÑŽÑ Ð¼Ð½Ð¾Ð¶ÐµÑтво ÑÑылок</li>
- <li><a href="http://fproxy.tino.i2p">fproxy.tino.i2p</a> — Freenet-прокÑи</li>
- <li><a href="http://echelon.i2p">echelon.i2p</a> — архив программного обеÑÐ¿ÐµÑ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ I2P</li>
- <li><a href="http://paste.i2p2.i2p">paste.i2p2.i2p</a> — анонимный pastebin-ÑервиÑ</li>
- </ul><br>
-
- СущеÑтвует множеÑтво других I2P-Ñайтов — пройдитеÑÑŒ по Ñтому ÑпиÑку, добавьте в Ñвои закладки вÑÑ‘, что Вам понравитÑÑ. ВозвращайтеÑÑŒ почаще!
- </li><br />
-
- <li class="tidylist"><b>Ðнонимно проÑматривать обычные веб-Ñайты</b> — в I2P по умолчанию наÑтроен глобальный анонимный «внешний прокÑи» («Outproxy»), через который будут перенаправлÑÑ‚ÑŒÑÑ Ð’Ð°ÑˆÐ¸ запроÑÑ‹ к http-Ñерверам обычного интернета. (При необходимоÑти Ð’Ñ‹ можете отключить Ñту функцию в ÑвойÑтвах i2p-Ñ‚ÑƒÐ½Ð½ÐµÐ»Ñ <a href="/i2ptunnel/">«eepProxy»</a>)</li>
-
- <li class="tidylist"><b>Передавать файлы</b> — Ð´Ð»Ñ Ñтого еÑÑ‚ÑŒ вÑтроенный <a href="/i2psnark">порт</a> BitTorrent-клиента <a href="http://www.klomp.org/snark/">Snark</a>.</li>
-
- <li class="tidylist"><b>ПользоватьÑÑ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾Ð¹ почтой</b> — ÑпаÑибо postman-у за Ñоздание почтовой ÑиÑтемы <a href="http://hq.postman.i2p/">hq.postman.i2p</a> ÑовмеÑтимой Ñ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¼Ð¸ почтовыми клиентами (через протоколы POP3/SMTP). С её помощью можно обмениватьÑÑ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð¹ как внутри I2P, так и Ñ Ð°Ð´Ñ€ÐµÑами обычного интернета. Мы также предлагаем попробовать <a href="/susimail/susimail">Susimail</a> — вÑтроенный почтовый клиент Ñ Ð²ÐµÐ±-интерфейÑом, уже наÑтроенный на работу Ñ Ñервером postman-а, вам лишь оÑтаетÑÑ Ñоздать аккаунт.</li>
-
-
- <li class="tidylist"><b>ОбщатьÑÑ Ð² анонимных чатах</b> — запуÑтите любой удобный Ð´Ð»Ñ Ð’Ð°Ñ IRC-клиент и подключитеÑÑŒ к Ñерверу <b>127.0.0.1 порт 6668</b>. По Ñтому адреÑу раÑположен вход на два анонимно хоÑÑ‚ÑщихÑÑ IRC-Ñервера. Ваше реальное меÑтоположение будет Ñкрыто как от Ñервера, так и от других пользователей.
-
- <li class="tidylist"><b>ВеÑти анонимный блог</b> — попробуйте <a href="http://syndie.i2p2.de/">Syndie</a></li>
-
- <li class="tidylist">и многое другое</li>
-</ul>
-
-<h2>Хотите завеÑти ÑобÑтвенный I2P-Ñайт?</h2>
-<p>Ð”Ð»Ñ Ñтого в I2P еÑÑ‚ÑŒ вÑтроенный http-Ñервер <a href="http://jetty.mortbay.org/">Jetty</a> работающий по адреÑу <a href="http://127.0.0.1:7658/">http://127.0.0.1:7658/</a>.
-
-ПроÑто помеÑтите Ñвои файлы в директорию <code>eepsite/docroot/</code> (<code>.war</code>-файлы JSP/Ñервлетов в директорию <code>eepsite/webapps/</code>, а CGI-Ñкрипты в директорию <code>eepsite/cgi-bin/</code>).
-
-ПоÑле Ñтого доÑтаточно запуÑтить туннель <a href="/i2ptunnel/">«I2P webserver»</a>, указывающий на Ваш Ñайт, и он Ñтанет доÑтупным Ð´Ð»Ñ Ð´Ñ€ÑƒÐ³Ð¸Ñ… пользователей.</p>
-
-<p>Подробную пошаговую инÑтрукцию Ð’Ñ‹ можете найти на <a href="http://127.0.0.1:7658/">временной Ñтраничке-заготовке Вашего Ñайта</a>.</ps>
-
-<h2><a name="trouble">ПоиÑк и уÑтранение неполадок</a></h2>
-<p>ÐаберитеÑÑŒ Ñ‚ÐµÑ€Ð¿ÐµÐ½Ð¸Ñ â€” первый Ñтарт I2P может занÑÑ‚ÑŒ до получаÑа из-за начального поиÑка пиров.
-
-<p>ЕÑли через 30 минут в графе «Ðктивные» вÑе еще меньше 10 подÑоединенных пиров, то Ð´Ð»Ñ Ð¿Ð¾Ð²Ñ‹ÑˆÐµÐ½Ð¸Ñ ÐºÐ°Ñ‡ÐµÑтва ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð’Ð°Ð¼ нужно открыть порт Ð´Ð»Ñ I2P на Вашем файерволе или роутере (иÑпользуемый номер порта можно поÑмотреть на <a href="/config.jsp">Ñтранице наÑтроек</a>).</p>
-
-<p>ЕÑли Ð’Ñ‹ не можете ÑоединитьÑÑ Ð½Ð¸ Ñ Ð¾Ð´Ð½Ð¸Ð¼ I2P-Ñайтом (даже <a href="http://www.i2p2.i2p/">www.i2p2.i2p</a>), проверьте, включен ли в Вашем браузере HTTP-прокÑи 127.0.0.1 порт 4444.</p>
-
+<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çais" alt="Français"></a>
+ <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Español" alt="Españ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>Добро пожаловать в I2P!</h2></div>
+<p>Когда Ð’Ñ‹ запуÑкаете I2P впервые — чиÑла в графе «Ðктивные» (Ñлева) начнут раÑти поÑтепенно, Ñто может занÑÑ‚ÑŒ неÑколько минут. Затем в ÑпиÑке «Локальные туннели» поÑвитÑÑ Ð·Ð°Ð¿Ð¸ÑÑŒ «коллективные клиенты» (еÑли Ñтого не ÑлучилоÑÑŒ, <a href="#trouble">Ñм. «уÑтранение неполадок»</a>).
+
+<p>ПоÑле поÑÐ²Ð»ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿Ð¸Ñи «коллективные клиенты» Ð’Ñ‹ можете:</p>
+<ul>
+
+ <li><b>ПроÑматривать I2P-Ñайты</b> (веб-Ñайты хоÑÑ‚ÑщиеÑÑ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾ внутри I2P Ñети). Ð”Ð»Ñ Ñтого наÑтройте в Вашем браузере <b>HTTP прокÑи-Ñервер 127.0.0.1 порт 4444</b>. С Ñтими наÑтройками попробуйте зайти на I2P-Ñайты по ÑÑылкам ниже:<br>
+
+ <ul class="links">
+ <li><a href="http://forum.i2p/">forum.i2p</a> — безопаÑное и анонимное зеркало Ð´Ð»Ñ Ñ„Ð¾Ñ€ÑƒÐ¼Ð° <a href="http://forum.i2p2.de/">forum.i2p2.de</a></li>
+ <li><a href="http://www.i2p2.i2p/">www.i2p2.i2p</a> или <a href="http://i2p-projekt.i2p">i2p-projekt.i2p</a> — безопаÑное и анонимное зеркало Ð´Ð»Ñ <a href="http://www.i2p2.de/">www.i2p2.de</a></li>
+ <li><a href="http://eepsites.i2p/">eepsites.i2p</a> — Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð°Ñ Ð¿Ð¾Ð¸ÑÐºÐ¾Ð²Ð°Ñ ÑиÑтема по I2P-Ñайтам</li>
+ <li><a href="http://ugha.i2p/">ugha.i2p</a> — I2P-вики, которую может редактировать любой пользователь, Ð¿Ð»ÑŽÑ Ð¼Ð½Ð¾Ð¶ÐµÑтво ÑÑылок</li>
+ <li><a href="http://fproxy.tino.i2p">fproxy.tino.i2p</a> — Freenet-прокÑи</li>
+ <li><a href="http://echelon.i2p">echelon.i2p</a> — архив программного обеÑÐ¿ÐµÑ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ I2P</li>
+ <li><a href="http://paste.i2p2.i2p">paste.i2p2.i2p</a> — анонимный pastebin-ÑервиÑ</li>
+ </ul><br>
+
+ СущеÑтвует множеÑтво других I2P-Ñайтов — пройдитеÑÑŒ по Ñтому ÑпиÑку, добавьте в Ñвои закладки вÑÑ‘, что Вам понравитÑÑ. ВозвращайтеÑÑŒ почаще!
+ </li><br />
+
+ <li class="tidylist"><b>Ðнонимно проÑматривать обычные веб-Ñайты</b> — в I2P по умолчанию наÑтроен глобальный анонимный «внешний прокÑи» («Outproxy»), через который будут перенаправлÑÑ‚ÑŒÑÑ Ð’Ð°ÑˆÐ¸ запроÑÑ‹ к http-Ñерверам обычного интернета. (При необходимоÑти Ð’Ñ‹ можете отключить Ñту функцию в ÑвойÑтвах i2p-Ñ‚ÑƒÐ½Ð½ÐµÐ»Ñ <a href="/i2ptunnel/">«eepProxy»</a>)</li>
+
+ <li class="tidylist"><b>Передавать файлы</b> — Ð´Ð»Ñ Ñтого еÑÑ‚ÑŒ вÑтроенный <a href="/i2psnark">порт</a> BitTorrent-клиента <a href="http://www.klomp.org/snark/">Snark</a>.</li>
+
+ <li class="tidylist"><b>ПользоватьÑÑ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾Ð¹ почтой</b> — ÑпаÑибо postman-у за Ñоздание почтовой ÑиÑтемы <a href="http://hq.postman.i2p/">hq.postman.i2p</a> ÑовмеÑтимой Ñ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¼Ð¸ почтовыми клиентами (через протоколы POP3/SMTP). С её помощью можно обмениватьÑÑ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð¹ как внутри I2P, так и Ñ Ð°Ð´Ñ€ÐµÑами обычного интернета. Мы также предлагаем попробовать <a href="/susimail/susimail">Susimail</a> — вÑтроенный почтовый клиент Ñ Ð²ÐµÐ±-интерфейÑом, уже наÑтроенный на работу Ñ Ñервером postman-а, вам лишь оÑтаетÑÑ Ñоздать аккаунт.</li>
+
+
+ <li class="tidylist"><b>ОбщатьÑÑ Ð² анонимных чатах</b> — запуÑтите любой удобный Ð´Ð»Ñ Ð’Ð°Ñ IRC-клиент и подключитеÑÑŒ к Ñерверу <b>127.0.0.1 порт 6668</b>. По Ñтому адреÑу раÑположен вход на два анонимно хоÑÑ‚ÑщихÑÑ IRC-Ñервера. Ваше реальное меÑтоположение будет Ñкрыто как от Ñервера, так и от других пользователей.
+
+ <li class="tidylist"><b>ВеÑти анонимный блог</b> — попробуйте <a href="http://syndie.i2p2.de/">Syndie</a></li>
+
+ <li class="tidylist">и многое другое</li>
+</ul>
+
+<h2>Хотите завеÑти ÑобÑтвенный I2P-Ñайт?</h2>
+<p>Ð”Ð»Ñ Ñтого в I2P еÑÑ‚ÑŒ вÑтроенный http-Ñервер <a href="http://jetty.mortbay.org/">Jetty</a> работающий по адреÑу <a href="http://127.0.0.1:7658/">http://127.0.0.1:7658/</a>.
+
+ПроÑто помеÑтите Ñвои файлы в директорию <code>eepsite/docroot/</code> (<code>.war</code>-файлы JSP/Ñервлетов в директорию <code>eepsite/webapps/</code>, а CGI-Ñкрипты в директорию <code>eepsite/cgi-bin/</code>).
+
+ПоÑле Ñтого доÑтаточно запуÑтить туннель <a href="/i2ptunnel/">«I2P webserver»</a>, указывающий на Ваш Ñайт, и он Ñтанет доÑтупным Ð´Ð»Ñ Ð´Ñ€ÑƒÐ³Ð¸Ñ… пользователей.</p>
+
+<p>Подробную пошаговую инÑтрукцию Ð’Ñ‹ можете найти на <a href="http://127.0.0.1:7658/">временной Ñтраничке-заготовке Вашего Ñайта</a>.</ps>
+
+<h2><a name="trouble">ПоиÑк и уÑтранение неполадок</a></h2>
+<p>ÐаберитеÑÑŒ Ñ‚ÐµÑ€Ð¿ÐµÐ½Ð¸Ñ â€” первый Ñтарт I2P может занÑÑ‚ÑŒ до получаÑа из-за начального поиÑка пиров.
+
+<p>ЕÑли через 30 минут в графе «Ðктивные» вÑе еще меньше 10 подÑоединенных пиров, то Ð´Ð»Ñ Ð¿Ð¾Ð²Ñ‹ÑˆÐµÐ½Ð¸Ñ ÐºÐ°Ñ‡ÐµÑтва ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð’Ð°Ð¼ нужно открыть порт Ð´Ð»Ñ I2P на Вашем файерволе или роутере (иÑпользуемый номер порта можно поÑмотреть на <a href="/config.jsp">Ñтранице наÑтроек</a>).</p>
+
+<p>ЕÑли Ð’Ñ‹ не можете ÑоединитьÑÑ Ð½Ð¸ Ñ Ð¾Ð´Ð½Ð¸Ð¼ I2P-Ñайтом (даже <a href="http://www.i2p2.i2p/">www.i2p2.i2p</a>), проверьте, включен ли в Вашем браузере HTTP-прокÑи 127.0.0.1 порт 4444.</p>
+
<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>
</div>
+на Ñерверах <a href="irc://irc.freenode.net/#i2p">irc.freenode.net</a>, irc.postman.i2p или irc.freshcoffee.i2p (поÑледние два объединены в одну Ñеть, а на freenode работает бот-ретранÑлÑтор).</p>
+<hr>
+</div>
diff --git a/installer/resources/readme/readme_sv.html b/installer/resources/readme/readme_sv.html
index 48f02e0c793055d4fe07846cdd41e6f401a9a97a..d4abd69378a50c46d7f07129b5a7fa9225c01a6a 100644
--- a/installer/resources/readme/readme_sv.html
+++ b/installer/resources/readme/readme_sv.html
@@ -1,99 +1,100 @@
<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çais" alt="Franç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>
-<div class="welcome"><h2>Welcome to I2P!</h2></div>
-<p>Om du just har startat I2P kommer de "Aktiva: #/#" börja öka inom
-några få minuter och du kommer se en destination kallad "delade
-klienter" på den vänstra listan (om inte <a href="#trouble">se
-nedan</a>). När de syns kan du:</p>
-<ul>
- <li><b>surfa på "eepsidor"</b> - inom I2P finns det anonyma sajter -
- ställ in din webbläsare till att använda <b>HTTP proxy vid
-127.0.0.1 port 4444</b>, surfa sen till en eepsida:<br>
- <ul class="links">
- <li><a href="http://forum.i2p/">forum.i2p</a>: en anonym och
-säker anslutning till <a
-href="http://forum.i2p2.de/">forum.i2p2.de</a></li>
- <li><a href="http://www.i2p2.i2p/">www.i2p2.i2p</a> en spegel
-<a href="http://i2p-projekt.i2p">i2p-projekt.i2p</a>:
- säker och anonym anslutning till <a
-href="http://www.i2p2.de/">www.i2p2.de</a></li>
- <li><a href="http://eepsites.i2p/">eepsites.i2p</a>: en anonym
-sökmotor</li>
- <li><a href="http://ugha.i2p/">ugha.i2p</a>: ugha's eepsida, en
-wiki som alla kan förändra, innehåller många länkar</li>
- <li><a href="http://fproxy.tino.i2p">fproxy.tino.i2p</a>:
-Freenet proxy</li>
- <li><a href="http://echelon.i2p">echelon.i2p</a>: programvaruförråd och information om I2P</li>
- <li><a href="http://paste.i2p2.i2p">paste.i2p2.i2p</a>: anonym och säker pastebin</li>
- </ul><br>
- Det finns många fler eepsidor - följ bara länkarna från dom du ser,
- spara dina favoriter och besök dom ofta!</li><br>
- <li><b>surfa på nätet</b> - det finns för närvarande en "utproxy" i I2P
-som är ansluten
- till din egen HTTP proxt på port 4444 - ställ helt enkelt in din
-webläsares proxy till
- att använda den och gå till vilken vanlig URL som helst - dina
-fröfrågningar kommer skickas
- genom I2P ntverket.</li>
- <li><b>överföra filer</b> - det finns en integrerad <a
-href="i2psnark/">översätting</a> av
- <a href="http://www.klomp.org/snark/">Snark</a> <a
-href="http://www.bittorrent.com/">BitTorrent</a>
- klienten.</li>
- <li><b>maila anonymt</b> - postman har skapat ett emailsystem som
-fungerar med vanliga email-klienter
- (POP3 / SMTP),som låter dig skicka email inom I2P så väl som till
-och från det vanliga Internet!
- skaffa dig ett konto hos <a
-href="http://hq.postman.i2p/">hq.postman.i2p</a>.
- Vi skickar med <a href="/susimail/susimail">susimail</a>,
- som är en webb-baserad anonymt inriktad pop3/smtp-klient, inställd
-till att ansluta till postmans email-tjänst.</li>
- <li><b>chatta anonymt</b> - starta din IRC-klient och anslut till
-servern vid
- <b>127.0.0.1 port 6668</b>. Den pekar mot en av två anonyma IRC
-servrar,
- men varken du eller dom vet var den andra är.</li>
- <li><b>blogga anonymt</b> - kika på <a
-href="http://syndie.i2p2.de/">Syndie</a></li>
- <li>och mycket mer</li>
-</ul>
-
-<h2>Vill du ha en egen eepsida?</h2>
-
-<p>Vi har skickat med mjukvara som låter dig driva en egen eepsida - en
-<a href="http://jetty.mortbay.org/">Jetty</a> instans lyssnar på
-<a href="http://127.0.0.1:7658/">http://127.0.0.1:7658/</a>. Lägg helt
-enkelt dina filer i
-<code>eepsite/docroot/</code> mappen (eller standard JSP/Servlet
-<code>.war</code>
-filer i <code>eepsite/webapps</code>, eller standard CGI-script i
-<code>eepsite/cgi-bin</code>)
-så kommer de synas. När du startat en <a href="/i2ptunnel/">eepsite
-tunnel</a> som pekar på Jetty-server, så kommer sajten vara möjlig att nå för
-alla andra.
-Mer detaljerade instruktioner för att skapa en eepsite finns på
-<a href="http://127.0.0.1:7658/">din tillfälliga eepsite</a>.
-</p>
-
-<h2><a name="trouble">Problem</a></h2>
-
-<p>Ha tålamod - I2P kan ta tid att starta första gången, medan den söker
-efter noder att ansluta till.
-Om, efter 30 minuter, "Aktiva: anslutna/anslutna nyligen" statistiken
-visar mindre än 10 anslutna
-noder, bör du öppna port 8887 i din brandvägg.
-Om du inte lyckas besöka några eepsidor alls (inte ens <a
-href="http://www.i2p2.i2p/">www.i2p2.i2p</a>),
-försäkra dig om att din webbläsare är inställd till att avända en proxy,
-127.0.0.1 på port 4444.
-Du kanske också vill kika på information på
-<a href="http://www.i2p2.i2p/">I2Ps webbsida</a>, fråga frågor på
-<a href="http://forum.i2p2.de/">I2P diskussions forumet</a>, eller kika
+<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çais" alt="Français"></a> <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Español" alt="Españ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örja öka inom
+några få minuter och du kommer se en destination kallad "delade
+klienter" på den vänstra listan (om inte <a href="#trouble">se
+nedan</a>). När de syns kan du:</p>
+<ul>
+ <li><b>surfa på "eepsidor"</b> - inom I2P finns det anonyma sajter -
+ ställ in din webbläsare till att använda <b>HTTP proxy vid
+127.0.0.1 port 4444</b>, surfa sen till en eepsida:<br>
+ <ul class="links">
+ <li><a href="http://forum.i2p/">forum.i2p</a>: en anonym och
+säker anslutning till <a
+href="http://forum.i2p2.de/">forum.i2p2.de</a></li>
+ <li><a href="http://www.i2p2.i2p/">www.i2p2.i2p</a> en spegel
+<a href="http://i2p-projekt.i2p">i2p-projekt.i2p</a>:
+ säker och anonym anslutning till <a
+href="http://www.i2p2.de/">www.i2p2.de</a></li>
+ <li><a href="http://eepsites.i2p/">eepsites.i2p</a>: en anonym
+sökmotor</li>
+ <li><a href="http://ugha.i2p/">ugha.i2p</a>: ugha's eepsida, en
+wiki som alla kan förändra, innehåller många länkar</li>
+ <li><a href="http://fproxy.tino.i2p">fproxy.tino.i2p</a>:
+Freenet proxy</li>
+ <li><a href="http://echelon.i2p">echelon.i2p</a>: programvaruförråd och information om I2P</li>
+ <li><a href="http://paste.i2p2.i2p">paste.i2p2.i2p</a>: anonym och säker pastebin</li>
+ </ul><br>
+ Det finns många fler eepsidor - följ bara länkarna från dom du ser,
+ spara dina favoriter och besök dom ofta!</li><br>
+ <li><b>surfa på nätet</b> - det finns för närvarande en "utproxy" i I2P
+som är ansluten
+ till din egen HTTP proxt på port 4444 - ställ helt enkelt in din
+webläsares proxy till
+ att använda den och gå till vilken vanlig URL som helst - dina
+fröfrågningar kommer skickas
+ genom I2P ntverket.</li>
+ <li><b>överföra filer</b> - det finns en integrerad <a
+href="i2psnark/">översätting</a> av
+ <a href="http://www.klomp.org/snark/">Snark</a> <a
+href="http://www.bittorrent.com/">BitTorrent</a>
+ klienten.</li>
+ <li><b>maila anonymt</b> - postman har skapat ett emailsystem som
+fungerar med vanliga email-klienter
+ (POP3 / SMTP),som låter dig skicka email inom I2P så väl som till
+och från det vanliga Internet!
+ skaffa dig ett konto hos <a
+href="http://hq.postman.i2p/">hq.postman.i2p</a>.
+ Vi skickar med <a href="/susimail/susimail">susimail</a>,
+ som är en webb-baserad anonymt inriktad pop3/smtp-klient, inställd
+till att ansluta till postmans email-tjänst.</li>
+ <li><b>chatta anonymt</b> - starta din IRC-klient och anslut till
+servern vid
+ <b>127.0.0.1 port 6668</b>. Den pekar mot en av två anonyma IRC
+servrar,
+ men varken du eller dom vet var den andra är.</li>
+ <li><b>blogga anonymt</b> - kika på <a
+href="http://syndie.i2p2.de/">Syndie</a></li>
+ <li>och mycket mer</li>
+</ul>
+
+<h2>Vill du ha en egen eepsida?</h2>
+
+<p>Vi har skickat med mjukvara som låter dig driva en egen eepsida - en
+<a href="http://jetty.mortbay.org/">Jetty</a> instans lyssnar på
+<a href="http://127.0.0.1:7658/">http://127.0.0.1:7658/</a>. Lägg helt
+enkelt dina filer i
+<code>eepsite/docroot/</code> mappen (eller standard JSP/Servlet
+<code>.war</code>
+filer i <code>eepsite/webapps</code>, eller standard CGI-script i
+<code>eepsite/cgi-bin</code>)
+så kommer de synas. När du startat en <a href="/i2ptunnel/">eepsite
+tunnel</a> som pekar på Jetty-server, så kommer sajten vara möjlig att nå för
+alla andra.
+Mer detaljerade instruktioner för att skapa en eepsite finns på
+<a href="http://127.0.0.1:7658/">din tillfälliga eepsite</a>.
+</p>
+
+<h2><a name="trouble">Problem</a></h2>
+
+<p>Ha tålamod - I2P kan ta tid att starta första gången, medan den söker
+efter noder att ansluta till.
+Om, efter 30 minuter, "Aktiva: anslutna/anslutna nyligen" statistiken
+visar mindre än 10 anslutna
+noder, bör du öppna port 8887 i din brandvägg.
+Om du inte lyckas besöka några eepsidor alls (inte ens <a
+href="http://www.i2p2.i2p/">www.i2p2.i2p</a>),
+försäkra dig om att din webbläsare är inställd till att avända en proxy,
+127.0.0.1 på port 4444.
+Du kanske också vill kika på information på
+<a href="http://www.i2p2.i2p/">I2Ps webbsida</a>, fråga frågor på
+<a href="http://forum.i2p2.de/">I2P diskussions forumet</a>, eller kika
fö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å IRC pÃ¥ <a
-href="irc://irc.freenode.net/#i2p">irc.freenode.net</a>, irc.postman.i2p
-eller irc.freshcoffee.i2p (de är alla sammankopplade).</p><hr />
</div>
+på IRC pÃ¥ <a
+href="irc://irc.freenode.net/#i2p">irc.freenode.net</a>, irc.postman.i2p
+eller irc.freshcoffee.i2p (de är alla sammankopplade).</p><hr />
+</div>
diff --git a/installer/resources/readme/readme_zh.html b/installer/resources/readme/readme_zh.html
index 936e22fb02e5d59080f5b822797c4b18f4baa798..12edc458d2b4c050fb0bc29df4774c3478335e5a 100644
--- 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çais" alt="Français"></a>
+ <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Español" alt="Españ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>
diff --git a/installer/resources/runplain.sh b/installer/resources/runplain.sh
index 644bdadcf9bfc02bc6bea03a86f7d13e5803e1f6..eaf2d297e06af0a3d362301122cd0505f51d6a40 100644
--- 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
diff --git a/installer/resources/themes/snark/ubergine/images/details.png b/installer/resources/themes/snark/ubergine/images/details.png
index 12cd1aef900803abba99b26920337ec01ad5c267..852e6aae73beafbba2d493887c9e9e35ab0aa6d6 100644
Binary files a/installer/resources/themes/snark/ubergine/images/details.png and b/installer/resources/themes/snark/ubergine/images/details.png differ
diff --git a/installer/resources/themes/snark/ubergine/images/details_nolink.png b/installer/resources/themes/snark/ubergine/images/details_nolink.png
new file mode 100644
index 0000000000000000000000000000000000000000..79fd2b72a774a6e7999829dd9ea83b03603c3529
Binary files /dev/null and b/installer/resources/themes/snark/ubergine/images/details_nolink.png differ
diff --git a/installer/resources/themes/snark/ubergine/images/priority.png b/installer/resources/themes/snark/ubergine/images/priority.png
new file mode 100644
index 0000000000000000000000000000000000000000..b450dcd85d38b6d8a2f60c8a75320b51e98392d9
Binary files /dev/null and b/installer/resources/themes/snark/ubergine/images/priority.png differ
diff --git a/installer/resources/themes/snark/ubergine/images/stopped.png b/installer/resources/themes/snark/ubergine/images/stopped.png
index 1258113a3063b39a701466b3cd87379235838e4b..846c8d077103f5c91e3e376b0dc3145d3d02628a 100644
Binary files a/installer/resources/themes/snark/ubergine/images/stopped.png and b/installer/resources/themes/snark/ubergine/images/stopped.png differ
diff --git a/installer/resources/themes/snark/ubergine/images/up.png b/installer/resources/themes/snark/ubergine/images/up.png
index 31bce12274be5dc14f7b5c5f07a866df68e22b25..2ed32cc87ab7191771d7f4bc1aacf2e2336acc9c 100644
Binary files a/installer/resources/themes/snark/ubergine/images/up.png and b/installer/resources/themes/snark/ubergine/images/up.png differ
diff --git a/installer/resources/themes/snark/ubergine/snark.css b/installer/resources/themes/snark/ubergine/snark.css
index 5ada66db07624d6f5ec6184e2fedbea3637dc413..535c329549e71d8a1cac703342be2628a3ca7015 100644
--- a/installer/resources/themes/snark/ubergine/snark.css
+++ b/installer/resources/themes/snark/ubergine/snark.css
@@ -17,20 +17,20 @@ 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;
color: #f70;
- text-shadow: 1px 1px #420;
+ text-shadow: 1px 1px #420;
background: url('/themes/snark/ubergine/images/snarknav_lowlight.png') no-repeat scroll center bottom;
background: #310 url('/themes/snark/ubergine/images/snarknav_on.png') repeat-x scroll center center;
- -moz-border-radius: 0px;
- -khtml-border-radius: 3px;
- border-radius: 0px;
- -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;
+ -moz-border-radius: 0px;
+ -khtml-border-radius: 3px;
+ border-radius: 0px;
+ -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;
}
@@ -43,13 +43,13 @@ 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;
- -moz-border-radius: 0;
- -khtml-border-radius: 0;
- border-radius: 0;
- -moz-box-shadow: inset 0 0 1px 0 #f90;
- -khtml-box-shadow: inset 0 0 1px 0 #f90;
- box-shadow: 0 0 1px #f90;
+ 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;
+ -moz-box-shadow: inset 0 0 1px 0 #f90;
+ -khtml-box-shadow: inset 0 0 1px 0 #f90;
+ box-shadow: 0 0 1px #f90;
}
.snarkRefresh:active {
@@ -64,28 +64,28 @@ body {
}
.snarkRefresh:last-child {
- -moz-border-radius: 0 3px 3px 0px;
- -khtml-border-radius: 0 3px 0 0;
- border-radius: 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;
+ -moz-border-radius: 0 3px 3px 0px;
+ -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;
}
.snarkRefresh:first-child {
- -moz-border-radius: 3px 0 0 3px;
- -khtml-border-radius: 3px;
- border-radius: 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;
+ -moz-border-radius: 3px 0 0 3px;
+ -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;
}
.snarkMessages {
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;
@@ -116,7 +116,7 @@ pre {
padding: 0;
text-align: left !important;
height: 8px;
- color: #13f;
+ color: #13f;
font-weight: bold !important;
}
@@ -126,18 +126,18 @@ table {
padding: 0px;
border-spacing: 0px;
border-collapse: collapse;
- color: #323;
- width: 100%;
- opacity: 1 !important;
+ color: #323;
+ width: 100%;
+ opacity: 1 !important;
}
tr {
- opacity: 1;
+ opacity: 1;
}
thead, tfoot {
- background: url("/themes/snark/ubergine/images/snark_thead.png") repeat-x scroll 0 0 #101;
- text-shadow:0 2px 5px #333333;
+ background: url("/themes/snark/ubergine/images/snark_thead.png") repeat-x scroll 0 0 #101;
+ text-shadow:0 2px 5px #333333;
}
thead a, tfoot a {
@@ -153,7 +153,7 @@ th {
font-size: 9pt;
border-top: 1px outset #001;
border-bottom: 1px inset #101;
- color: #ddd;
+ color: #ddd;
whitespace: nowrap;
font-variant: small-caps !important;
letter-spacing: 0.05em;
@@ -161,13 +161,12 @@ th {
th:first-child {
text-align: left !important;
- padding-left: 2px;
- max-width: 120px;
+ padding-left: 2px;
}
tfoot td:first-child {
text-align: left !important;
- padding-left: 0px;
+ padding-left: 0px;
}
th:first-child img {
@@ -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;
@@ -190,9 +215,9 @@ tfoot th {
td {
padding: 1px;
- color: #ddd !important;
- font-size: 9.5pt;
- opacity: 1;
+ color: #ddd !important;
+ opacity: 1;
+ font-size: 9.5pt;
}
.mainsection td {
@@ -201,25 +226,25 @@ td {
td:first-child {
text-align: right;
- padding-left: 10px;
+ font-size: 9.5pt;
}
.snarkTorrentName {
text-shadow:1px 1px #550000;
- padding: 2px 0 0;
+ padding: 2px 0 0;
}
.snarkTorrentAction {
text-shadow:1px 1px #550000;
- padding: 1px 1px 1px 1px !important;
- margin: 0 !important;
- text-align: center;
- width: 68px;
+ padding: 1px 1px 1px 1px !important;
+ margin: 0 !important;
+ text-align: center;
+ width: 68px;
}
.snarkTorrentAction img {
margin: 0 2px !important;
- opacity: 0.6;
+ opacity: 0.6;
}
.snarkTorrentAction img:hover {
@@ -233,19 +258,12 @@ td:first-child {
background: #202;
}
-/*
-.snarkTorrentEven tr:first-child {
- border: 1px dotted #fff !important;
-}
-
-*/
-
.snarkTorrentNoneLoaded {
background: #323;
font-size: 8.5pt;
- font-weight: bold;
- text-align: center !important;
- color: #bbb !important;
+ font-weight: bold;
+ text-align: center !important;
+ color: #bbb !important;
}
.snarkTorrentStatus {
@@ -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,42 +297,49 @@ td:first-child {
color: #b9b !important;
}
-.snarkTorrentRate {
- color: #d9d !important;
+.snarkTorrentRateUp {
+ color: #b9b !important;
}
+.snarkTorrentRateDown {
+ color: #76a !important;
+}
.snarkTorrentOdd {
background: #656;
background: #351933;
font-size: 8pt;
- border: 0px inset #101 !important;
- border-left: 0 !important;
- border-right: 0 !important;
+ border: 0px inset #101 !important;
+ border-left: 0 !important;
+ border-right: 0 !important;
}
.snarkTorrentOdd td, .snarkTorrentEven td {
- border-top: 1px dotted #313 !important;
+ border-top: 1px dotted #313 !important;
}
.snarkFileName {
-/* min-width: 25em;*/
padding: 4px 0px !important;
- text-align: left !important;
+ text-align: left !important;
+ font-size: 8pt !important;
}
.snarkFileSize {
padding: 4px 2px;
+ font-weight: bold;
+ color: #b6b !important;
}
.snarkFileStatus {
- padding: 4px 10px;
- text-align: center;
- font-style: italic;
+ padding: 4px 5px 4px 15px;
+ text-align: center;
+ font-style: italic;
+ font-size: 8pt;
+ text-align: left;
}
.snarkTorrentETA {
font-weight: bold;
- font-style: italic;
+ font-style: italic;
color: #dd7 !important;
}
@@ -336,17 +360,17 @@ td:first-child {
.snarkConfigTitle {
font-size: 11pt;
font-weight: bold;
- padding: 0 25px 3px 25px;
- margin: 5px 0 10px 0 !important;
- letter-spacing: 0.25em;
- border: 1px solid #111;
- -moz-border-radius: 0 0 5px 5px;
- -khtml-border-radius: 0 0 5px 5px;
- border-radius: 0 0 5px 5px;
- border-top: 0;
- text-shadow: 0px 3px 5px #323;
- background: #101 url('/themes/snark/ubergine/images/snarknav.png') repeat-x scroll center center !important;
- font-variant: small-caps !important;
+ padding: 0 25px 3px 25px;
+ margin: 5px 0 10px 0 !important;
+ letter-spacing: 0.25em;
+ border: 1px solid #111;
+ -moz-border-radius: 0 0 5px 5px;
+ -khtml-border-radius: 0 0 5px 5px;
+ border-radius: 0 0 5px 5px;
+ border-top: 0;
+ text-shadow: 0px 3px 5px #323;
+ background: #101 url('/themes/snark/ubergine/images/snarknav.png') repeat-x scroll center center !important;
+ font-variant: small-caps !important;
}
.snarkConfig {
@@ -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;
@@ -374,7 +398,7 @@ td:first-child {
}
form {
- margin-bottom: 0;
+ margin-bottom: 0;
}
p {
@@ -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;
+ color: #f60;
+ margin: 2px 0;
}
input.r {
@@ -429,33 +454,40 @@ input.r {
input[type=submit] {
text-shadow: 0px 0px #410;
- color: #000;
- background: #989;
- border: 1px inset #bbb;
+ color: #000;
+ background: #989;
+ border: 1px inset #bbb;
+ padding: 2px;
}
input[type=submit]:hover {
- border: 1px outset #bbb;
+ border: 1px outset #bbb;
text-shadow: 0 0;
background: #f60;
- color: #fff;
- text-shadow: 0px 1px 5px #f00;
+ color: #fff;
+ text-shadow: 0px 1px 5px #f00;
}
input[type=submit]:active {
background: #000 !important;
- color: #f60 !important;
- text-shadow: 0 !important;
+ color: #f60 !important;
+ text-shadow: 0 !important;
}
input[type=text]:active, input[type=text]:hover, input.r:hover {
background: #f60;
- color: #fff;
+ 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;
+ background: url('/themes/snark/ubergine/images/graytile.png') !important;
color: #f60;
font: 9pt "Lucida Sans Unicode","Bitstream Vera Sans",Verdana,Tahoma,Helvetica,sans-serif;
font-weight: bold;
@@ -463,13 +495,13 @@ select {
-moz-border-radius: 4px 0 0 4px;
-khtml-border-radius: 4px 0 0 4px;
border-radius: 4px 0 0 4px;
- border: 1px solid #000;
+ border: 1px solid #000;
}
select:hover, textarea:hover {
background: #f60 !important;
- color: #fff;
-}
+ color: #fff !important;
+}
textarea {
background: #111 url('/themes/snark/ubergine/images/graytile.png');
@@ -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;
@@ -508,7 +557,7 @@ div.section,div.mainsection {
word-wrap: break-word;
text-align: center;
background: #545;
- opacity: 1 !important;
+ opacity: 1 !important;
}
div.newtorrentsection {
@@ -585,12 +634,12 @@ div.configsectionpanel {
div.configsection table{
color: #ffb;
- opacity: 1;
+ opacity: 1;
}
div.configsection a {
color: #f60;
- text-shadow: 1px 1px #500;
+ text-shadow: 1px 1px #500;
}
div.configsection a:hover {
@@ -599,19 +648,19 @@ div.configsection a:hover {
}
code {
- font-size: 9pt;
+ font-size: 9.5pt;
color: #b8b;
- padding: 0 2px;
- font-weight: bold;
- font-family: "Lucida Console", "DejaVu Sans Mono", Courier, mono;
+ padding: 0 2px;
+ font-weight: bold;
+ font-family: "Lucida Console", "DejaVu Sans Mono", Courier, mono;
}
.snarknavbar {
margin: -10px 0 5px 0 !important;
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;
@@ -621,9 +670,9 @@ code {
font-weight: bold;
font-size: 11.5pt;
color: #001;
- min-width: 700px;
- width: 700px;
- text-align: center;
+ min-width: 700px;
+ width: 70%;
+ text-align: center;
}
.snarknavbar img {
diff --git a/router/java/src/net/i2p/router/RouterThrottleImpl.java b/router/java/src/net/i2p/router/RouterThrottleImpl.java
index 795e1636c5f49fa310b5c4501f6159ae9d1db9b0..d3d3129af31a263dde6fc0aa88a1c4f8bf802d93 100644
--- 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();
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 7ca1a3ec2c4e6b0a58a1f89cf73e6cb3036dcf84..87e5bffca0684477c0ba8daee48da05fbea99f44 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
- public final static long BUILD = 10;
+ public final static long BUILD = 1;
/** for example "-test" */
public final static String EXTRA = "";