0.9.8

(also adding missing shebang lines)

.mtn-ignore

@@ -1,5 +1,7 @@
 # Just to try and prevent some noob disasters.
 # Use mtn add --no-respect-ignore foo.jar to ignore this ignore list
+
+# Temporary/build files
 _jsp\.java$
 \.bz2$
 \.tar$
@@ -19,13 +21,27 @@ _jsp\.java$
 .\deb$
 \.zip$
 ^\.
-^build
-^pkg-temp/
 ~$
+web-fragment.xml
+web-out.xml
+
+# Temporary/build dirs
+^build
+^pkg-temp
 /build
-/classes/
+/classes
+/dist
+/mo
+/tmp
+^apps/jetty/jettylib
+
+# Debian-related
 ^debian/copyright
 ^debian/changelog
+
+# Build property overrides
 override.properties
+
+# Reporting
 sloccount.sc
 ^reports/

.tx/config

@@ -13,12 +13,32 @@ trans.nb = apps/i2ptunnel/locale/messages_nb.po
 trans.nl = apps/i2ptunnel/locale/messages_nl.po
 trans.pl = apps/i2ptunnel/locale/messages_pl.po
 trans.pt = apps/i2ptunnel/locale/messages_pt.po
-trans.ru = apps/i2ptunnel/locale/messages_ru.po
+trans.ru_RU = apps/i2ptunnel/locale/messages_ru.po
 trans.sv_SE = apps/i2ptunnel/locale/messages_sv.po
 trans.uk_UA = apps/i2ptunnel/locale/messages_uk.po
 trans.vi = apps/i2ptunnel/locale/messages_vi.po
 trans.zh_CN = apps/i2ptunnel/locale/messages_zh.po
 
+[I2P.proxy]
+source_file = apps/i2ptunnel/locale-proxy/messages_en.po
+source_lang = en
+trans.ar = apps/i2ptunnel/locale-proxy/messages_ar.po
+trans.cs = apps/i2ptunnel/locale-proxy/messages_cs.po
+trans.de = apps/i2ptunnel/locale-proxy/messages_de.po
+trans.es = apps/i2ptunnel/locale-proxy/messages_es.po
+trans.fr = apps/i2ptunnel/locale-proxy/messages_fr.po
+trans.hu = apps/i2ptunnel/locale-proxy/messages_hu.po
+trans.it = apps/i2ptunnel/locale-proxy/messages_it.po
+trans.nb = apps/i2ptunnel/locale-proxy/messages_nb.po
+trans.nl = apps/i2ptunnel/locale-proxy/messages_nl.po
+trans.pl = apps/i2ptunnel/locale-proxy/messages_pl.po
+trans.pt = apps/i2ptunnel/locale-proxy/messages_pt.po
+trans.ru_RU = apps/i2ptunnel/locale-proxy/messages_ru.po
+trans.sv_SE = apps/i2ptunnel/locale-proxy/messages_sv.po
+trans.uk_UA = apps/i2ptunnel/locale-proxy/messages_uk.po
+trans.vi = apps/i2ptunnel/locale-proxy/messages_vi.po
+trans.zh_CN = apps/i2ptunnel/locale-proxy/messages_zh.po
+
 [I2P.routerconsole]
 source_file = apps/routerconsole/locale/messages_en.po
 source_lang = en
@@ -37,12 +57,28 @@ trans.nb = apps/routerconsole/locale/messages_nb.po
 trans.nl = apps/routerconsole/locale/messages_nl.po
 trans.pl = apps/routerconsole/locale/messages_pl.po
 trans.pt = apps/routerconsole/locale/messages_pt.po
-trans.ru = apps/routerconsole/locale/messages_ru.po
+trans.ro = apps/routerconsole/locale/messages_ro.po
+trans.ru_RU = apps/routerconsole/locale/messages_ru.po
 trans.sv_SE = apps/routerconsole/locale/messages_sv.po
+trans.tr_TR = apps/routerconsole/locale/messages_tr.po
 trans.uk_UA = apps/routerconsole/locale/messages_uk.po
 trans.vi = apps/routerconsole/locale/messages_vi.po
 trans.zh_CN = apps/routerconsole/locale/messages_zh.po
 
+[I2P.welcome]
+source_file = apps/routerconsole/locale-news/messages_en.po
+source_lang = en
+trans.ar = apps/routerconsole/locale-news/messages_ar.po
+trans.de = apps/routerconsole/locale-news/messages_de.po
+trans.es = apps/routerconsole/locale-news/messages_es.po
+trans.fr = apps/routerconsole/locale-news/messages_fr.po
+trans.nl = apps/routerconsole/locale-news/messages_nl.po
+trans.pt = apps/routerconsole/locale-news/messages_pt.po
+trans.ru_RU = apps/routerconsole/locale-news/messages_ru.po
+trans.sv_SE = apps/routerconsole/locale-news/messages_sv.po
+trans.tr_TR = apps/routerconsole/locale-news/messages_tr.po
+trans.zh_CN = apps/routerconsole/locale-news/messages_zh.po
+
 [I2P.i2psnark]
 source_file = apps/i2psnark/locale/messages_en.po
 source_lang = en
@@ -77,7 +113,8 @@ trans.it = apps/susidns/locale/messages_it.po
 trans.nl = apps/susidns/locale/messages_nl.po
 trans.pl = apps/susidns/locale/messages_pl.po
 trans.pt = apps/susidns/locale/messages_pt.po
-trans.ru = apps/susidns/locale/messages_ru.po
+trans.ro = apps/susidns/locale/messages_ro.po
+trans.ru_RU = apps/susidns/locale/messages_ru.po
 trans.sv_SE = apps/susidns/locale/messages_sv.po
 trans.uk_UA = apps/susidns/locale/messages_uk.po
 trans.vi = apps/susidns/locale/messages_vi.po
@@ -97,9 +134,10 @@ trans.hu = apps/desktopgui/locale/messages_hu.po
 trans.it = apps/desktopgui/locale/messages_it.po
 trans.nl = apps/desktopgui/locale/messages_nl.po
 trans.pl = apps/desktopgui/locale/messages_pl.po
-trans.ru = apps/desktopgui/locale/messages_ru.po
+trans.ru_RU = apps/desktopgui/locale/messages_ru.po
 trans.sv_SE = apps/desktopgui/locale/messages_sv.po
 trans.uk_UA = apps/desktopgui/locale/messages_uk.po
+trans.tr_TR = apps/desktopgui/locale/messages_tr.po
 trans.vi = apps/desktopgui/locale/messages_vi.po
 trans.zh_CN = apps/desktopgui/locale/messages_zh.po
 
@@ -113,10 +151,11 @@ trans.fr = apps/susimail/locale/messages_fr.po
 trans.hu = apps/susimail/locale/messages_hu.po
 trans.it = apps/susimail/locale/messages_it.po
 trans.nl = apps/susimail/locale/messages_nl.po
-trans.ru = apps/susimail/locale/messages_ru.po
+trans.ru_RU = apps/susimail/locale/messages_ru.po
 trans.sv_SE = apps/susimail/locale/messages_sv.po
 trans.pl = apps/susimail/locale/messages_pl.po
 trans.pt = apps/susimail/locale/messages_pt.po
+trans.ro = apps/susimail/locale/messages_ro.po
 trans.uk_UA = apps/susimail/locale/messages_uk.po
 trans.vi = apps/susimail/locale/messages_vi.po
 trans.zh_CN = apps/susimail/locale/messages_zh.po
@@ -132,18 +171,25 @@ trans.fr = debian/po/fr.po
 trans.it = debian/po/it.po
 trans.hu = debian/po/hu.po
 trans.pl = debian/po/pl.po
-trans.ru = debian/po/ru.po
+trans.pt = debian/po/pt.po
+trans.ru_RU = debian/po/ru.po
 trans.sv_SE = debian/po/sv.po
 trans.uk_UA = debian/po/uk.po
+trans.tr_TR = debian/po/tr.po
+trans.zh_CN = debian/po/zh.po
 
 [I2P.i2prouter-script]
 source_file = installer/resources/locale/po/messages_en.po
 source_lang = en
 trans.de = installer/resources/locale/po/messages_de.po
+trans.es = installer/resources/locale/po/messages_es.po
 trans.fr = installer/resources/locale/po/messages_fr.po
 trans.it = installer/resources/locale/po/messages_it.po
+trans.pt = installer/resources/locale/po/messages_pt.po
 trans.sv_SE = installer/resources/locale/po/messages_sv.po
 trans.ru_RU = installer/resources/locale/po/messages_ru.po
+trans.tr_TR = installer/resources/locale/po/messages_tr.po
+trans.zh_CN = installer/resources/locale/po/messages_zh.po
 
 [main]
 host = http://www.transifex.net

LICENSE.txt

@@ -132,7 +132,7 @@ Installer:
 
 
 
-Java Service Wrapper Community Edition 32-bit 3.5.13:
+Java Service Wrapper Community Edition 32-bit 3.5.19:
    Copyright (C) 1999-2011 Tanuki Software, Ltd. All Rights Reserved.
    See licenses/LICENSE-Wrapper.txt
 
@@ -177,7 +177,7 @@ Applications:
    By welterde.
    See licenses/LICENSE-GPLv2.txt
 
-   Jetty 7.6.10.v20130312:
+   Jetty 7.6.12.v20130726:
    See licenses/ABOUT-Jetty.html
    See licenses/NOTICE-Jetty.html
    See licenses/LICENSE-Apache2.0.txt
@@ -207,7 +207,7 @@ Applications:
        FatCow icons: See licenses/LICENSE-FatCowIcons.txt
 
        GeoIP Data:
-       Copyright (c) 2008 MaxMind, Inc.  All Rights Reserved.
+       This product includes GeoLite data created by MaxMind, available from http://www.maxmind.com/
        See licenses/LICENSE-GeoIP.txt
 
    Router Console and I2PSnark themes:
@@ -243,8 +243,8 @@ Applications:
       Bundles systray4j-2.4.1:
       See licenses/LICENSE-LGPLv2.1.txt
 
-   Tomcat 6.0.36:
-   Copyright 1999-2012 The Apache Software Foundation
+   Tomcat 6.0.37:
+   Copyright 1999-2013 The Apache Software Foundation
    See licenses/LICENSE-Apache2.0.txt
    See licenses/NOTICE-Tomcat.txt
 

Slackware/i2p/doinst.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 INST_DIR=directory
 

apps/BOB/.classpath

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ministreaming"/>
+	<classpathentry kind="output" path="build"/>
+</classpath>

apps/BOB/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>BOB</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

apps/BOB/src/net/i2p/BOB/DoCMDS.java

@@ -388,7 +388,7 @@ public class DoCMDS implements Runnable {
 	 * Does the base64 information look OK
 	 *
 	 * @param data
-	 * @return
+	 * @return OK
 	 */
 	private boolean is64ok(String data) {
 		try {

apps/addressbook/.classpath

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="java/src"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="/jetty/jettylib/javax.servlet.jar"/>
+	<classpathentry kind="output" path="build"/>
+</classpath>

apps/addressbook/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>addressbook</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

apps/addressbook/java/src/net/i2p/addressbook/AddressBook.java

@@ -260,7 +260,7 @@ class AddressBook {
      *            An AddressBook to merge with.
      * @param overwrite True to overwrite
      * @param log
-     *            The log to write messages about new addresses or conflicts to.
+     *            The log to write messages about new addresses or conflicts to. May be null.
      *
      * @throws IllegalStateException if this was created with the Subscription constructor.
      */

apps/addressbook/java/src/net/i2p/addressbook/Daemon.java

@@ -37,6 +37,7 @@ import net.i2p.client.naming.SingleFileNamingService;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
 import net.i2p.util.SecureDirectory;
+import net.i2p.util.SystemVersion;
 
 /**
  * Main class of addressbook.  Performs updates, and runs the main loop.
@@ -47,7 +48,7 @@ import net.i2p.util.SecureDirectory;
 public class Daemon {
     public static final String VERSION = "2.0.4";
     private static final Daemon _instance = new Daemon();
-    private boolean _running;
+    private volatile boolean _running;
     private static final boolean DEBUG = false;
     
     /**
@@ -168,7 +169,7 @@ public class Daemon {
                                 if (publishedNS == null)
                                     publishedNS = new SingleFileNamingService(I2PAppContext.getGlobalContext(), published.getAbsolutePath());
                                 success = publishedNS.putIfAbsent(key, dest);
-                                if (!success) {
+                                if (log != null && !success) {
                                     try {
                                         log.append("Save to published address book " + published.getCanonicalPath() + " failed for new key " + key);
                                     } catch (IOException ioe) {}
@@ -257,7 +258,7 @@ public class Daemon {
         SubscriptionList subscriptions = new SubscriptionList(subscriptionFile,
                 etagsFile, lastModifiedFile, lastFetchedFile, delay, defaultSubs, settings
                 .get("proxy_host"), Integer.parseInt(settings.get("proxy_port")));
-        Log log = new Log(logFile);
+        Log log = SystemVersion.isAndroid() ? null : new Log(logFile);
 
         // If false, add hosts via naming service; if true, write hosts.txt file directly
         // Default false

apps/desktopgui/build.xml

@@ -44,6 +44,7 @@
 
 	<target name="bundle" unless="no.bundle">
         <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
+            <env key="JAVA_HOME" value="${java.home}" />
             <arg value="./bundle-messages.sh" />
         </exec>
         <exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="${require.gettext}" >

apps/desktopgui/bundle-messages.sh

@@ -16,6 +16,10 @@ TMPFILE=build/javafiles.txt
 export TZ=UTC
 RC=0
 
+if ! $(which javac > /dev/null 2>&1); then
+    export JAVAC=${JAVA_HOME}/../bin/javac
+fi
+
 if [ "$1" = "-p" ]
 then
 	POUPDATE=1

apps/desktopgui/locale/messages_ar.po

@@ -11,6 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2011-02-20 11:53+0000\n"
 "PO-Revision-Date: 2011-02-26 19:46-0000\n"
 "Last-Translator: hamada <hamada@mail.i2p>\n"
+"Language: ar\n"
 "Language-Team: duck <duck@mail.i2p>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

apps/desktopgui/locale/messages_en.po

@@ -12,7 +12,7 @@ msgstr ""
 "PO-Revision-Date: 2010-06-15 14:09+0100\n"
 "Last-Translator: duck <duck@mail.i2p>\n"
 "Language-Team: duck <duck@mail.i2p>\n"
-"Language: \n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

apps/desktopgui/locale/messages_fr.po

@@ -2,21 +2,25 @@
 # Copyright (C) 2009 The I2P Project
 # This file is distributed under the same license as the desktopgui package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
-# foo <foo@bar>, 2009.
-#
+# 
+# Translators:
+# blabla <blabla@trash-mail.com>, 2011
+# ducki2p <ducki2p@gmail.com>, 2011
+# foo <foo@bar>, 2009
+# Boxoa590, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: I2P desktopgui\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
 "POT-Creation-Date: 2011-03-03 18:29+0000\n"
-"PO-Revision-Date: 2011-03-30 21:58+0100\n"
-"Last-Translator: magma <magma@mail.i2p>\n"
-"Language-Team: duck <duck@mail.i2p>\n"
-"Language: \n"
+"PO-Revision-Date: 2013-06-08 04:50+0000\n"
+"Last-Translator: Boxoa590\n"
+"Language-Team: French (http://www.transifex.com/projects/p/I2P/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:23
 msgid "Start I2P"
@@ -24,7 +28,7 @@ msgstr "Démarrer I2P"
 
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:38
 msgid "I2P is starting!"
-msgstr "I2P démarre!"
+msgstr "I2P démarre !"
 
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:38
 msgid "Starting"
@@ -32,7 +36,7 @@ msgstr "Démarrage"
 
 #: src/net/i2p/desktopgui/InternalTrayManager.java:26
 msgid "Launch I2P Browser"
-msgstr "Lancer le navigateur"
+msgstr "Lancer le navigateur I2P"
 
 #: src/net/i2p/desktopgui/InternalTrayManager.java:50
 msgid "Configure desktopgui"
@@ -52,5 +56,4 @@ msgstr "Configuration de l'icône de notification"
 
 #: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
 msgid "Should tray icon be enabled?"
-msgstr "Activer l'icône de notification"
-
+msgstr "Activer l'icône de notification ?"

apps/desktopgui/locale/messages_ru.po

@@ -2,21 +2,24 @@
 # Copyright (C) 2009 The I2P Project
 # This file is distributed under the same license as the desktopgui package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
-# foo <foo@bar>, 2009.
-#
+# 
+# Translators:
+# ducki2p <ducki2p@gmail.com>, 2011
+# foo <foo@bar>, 2009
+# Roman Azarenko <x12ozmouse@ya.ru>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: I2P desktopgui\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-19 17:26+0000\n"
-"PO-Revision-Date: 2011-02-23 10:23+0500\n"
-"Last-Translator: Hidden Z <hiddenz@mail.i2p>\n"
-"Language-Team: duck <duck@mail.i2p>\n"
-"Language: \n"
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2013-07-07 11:44+0000\n"
+"Last-Translator: Roman Azarenko <x12ozmouse@ya.ru>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/I2P/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language: ru_RU\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:23
 msgid "Start I2P"
@@ -32,7 +35,7 @@ msgstr "Запускается"
 
 #: src/net/i2p/desktopgui/InternalTrayManager.java:26
 msgid "Launch I2P Browser"
-msgstr "Запустить I2P браузер"
+msgstr "Запустить браузер I2P"
 
 #: src/net/i2p/desktopgui/InternalTrayManager.java:50
 msgid "Configure desktopgui"
@@ -48,9 +51,8 @@ msgstr "Остановить I2P"
 
 #: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
 msgid "Tray icon configuration"
-msgstr "Настройка иконки в трее"
+msgstr "Конфигурация значка в области уведомлений"
 
 #: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
 msgid "Should tray icon be enabled?"
-msgstr "Отображать ли иконку в трее?"
-
+msgstr "Отображать ли значок в области уведомлений?"

apps/desktopgui/locale/messages_tr.po

@@ -0,0 +1,56 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# Kaya Zeren <kayazeren@gmail.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2013-04-26 06:07+0000\n"
+"Last-Translator: Kaya Zeren <kayazeren@gmail.com>\n"
+"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/I2P/language/tr_TR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr_TR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "I2P başlasın"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P başlatılıyor!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Başlatılıyor"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "I2P Tarayıcısını Açın"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Masaüstü Arayüzünü Ayarlayın"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "I2P Yeniden Başlasın"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "I2P Durdurulsun"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Sistem tepsisi simgesi ayarı"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "Sistem tepsisi simgesi kullanılsın"

apps/i2psnark/java/build.xml

@@ -130,6 +130,7 @@
         <!-- Update the messages_*.po files.
              We need to supply the bat file for windows, and then change the fail property to true -->
         <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
+            <env key="JAVA_HOME" value="${java.home}" />
             <arg value="./bundle-messages.sh" />
         </exec>
         <exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="${require.gettext}" >
@@ -175,7 +176,6 @@
         <copy file="../../jetty/jettylib/commons-logging.jar" tofile="./dist/lib/commons-logging.jar" />
         <copy file="../../jetty/jettylib/javax.servlet.jar" tofile="./dist/lib/javax.servlet.jar" />
         <copy file="../../jetty/jettylib/org.mortbay.jetty.jar" tofile="./dist/lib/org.mortbay.jetty.jar" />
-        <copy file="../../jetty/jettylib/jasper-compiler.jar" tofile="./dist/lib/jasper-compiler.jar" />
         <copy file="../../jetty/jettylib/jasper-runtime.jar" tofile="./dist/lib/jasper-runtime.jar" />
         <copy file="../../ministreaming/java/build/mstreaming.jar" tofile="./dist/lib/mstreaming.jar" />
         <copy file="../../streaming/java/build/streaming.jar" tofile="./dist/lib/streaming.jar" />

apps/i2psnark/java/bundle-messages.sh

@@ -15,6 +15,10 @@ TMPFILE=build/javafiles.txt
 export TZ=UTC
 RC=0
 
+if ! $(which javac > /dev/null 2>&1); then
+    export JAVAC=${JAVA_HOME}/../bin/javac
+fi
+
 if [ "$1" = "-p" ]
 then
 	POUPDATE=1

apps/i2psnark/java/src/net/i2p/kademlia/XORComparator.java

@@ -2,7 +2,6 @@ package net.i2p.kademlia;
 
 import java.util.Comparator;
 
-import net.i2p.data.DataHelper;
 import net.i2p.data.SimpleDataStructure;
 
 /**
@@ -21,8 +20,20 @@ class XORComparator<T extends SimpleDataStructure> implements Comparator<T> {
     }
 
     public int compare(T lhs, T rhs) {
-        byte lhsDelta[] = DataHelper.xor(lhs.getData(), _base);
-        byte rhsDelta[] = DataHelper.xor(rhs.getData(), _base);
-        return DataHelper.compareTo(lhsDelta, rhsDelta);
+        // same as the following but byte-by-byte for efficiency
+        //byte lhsDelta[] = DataHelper.xor(lhs.getData(), _base);
+        //byte rhsDelta[] = DataHelper.xor(rhs.getData(), _base);
+        //return DataHelper.compareTo(lhsDelta, rhsDelta);
+        byte lhsb[] = lhs.getData();
+        byte rhsb[] = rhs.getData();
+        for (int i = 0; i < _base.length; i++) {
+            int ld = (lhsb[i] ^ _base[i]) & 0xff;
+            int rd = (rhsb[i] ^ _base[i]) & 0xff;
+            if (ld < rd)
+                return -1;
+            if (ld > rd)
+                return 1;
+        }
+        return 0;
     }
 }

apps/i2psnark/java/src/org/klomp/snark/BWLimits.java

@@ -37,7 +37,9 @@ class BWLimits {
         return rv;
     }
 
+/****
     public static void main(String args[]) {
         System.out.println(Arrays.toString(getBWLimits("127.0.0.1", 7654)));
     }
+****/
 }

apps/i2psnark/java/src/org/klomp/snark/ConnectionAcceptor.java

@@ -33,11 +33,10 @@ import net.i2p.data.Hash;
 import net.i2p.util.I2PAppThread;
 import net.i2p.util.Log;
 import net.i2p.util.ObjectCounter;
-import net.i2p.util.SimpleScheduler;
-import net.i2p.util.SimpleTimer;
+import net.i2p.util.SimpleTimer2;
 
 /**
- * Accepts connections on a TCP port and routes them to sub-acceptors.
+ * Accepts connections on a I2PServerSocket and routes them to PeerAcceptors.
  */
 class ConnectionAcceptor implements Runnable
 {
@@ -47,14 +46,22 @@ class ConnectionAcceptor implements Runnable
   private Thread thread;
   private final I2PSnarkUtil _util;
   private final ObjectCounter<Hash> _badCounter = new ObjectCounter();
+  private final SimpleTimer2.TimedEvent _cleaner;
 
-  private boolean stop;
+  private volatile boolean stop;
   private boolean socketChanged;
 
-  private static final int MAX_BAD = 2;
+  // protocol errors before blacklisting.
+  private static final int MAX_BAD = 1;
   private static final long BAD_CLEAN_INTERVAL = 30*60*1000;
 
-  public ConnectionAcceptor(I2PSnarkUtil util) { _util = util; }
+  /**
+   *  Multitorrent
+   */
+  public ConnectionAcceptor(I2PSnarkUtil util) {
+      _util = util;
+      _cleaner = new Cleaner();
+  }
   
   public synchronized void startAccepting(PeerCoordinatorSet set, I2PServerSocket socket) {
     if (serverSocket != socket) {
@@ -67,11 +74,14 @@ class ConnectionAcceptor implements Runnable
           thread = new I2PAppThread(this, "I2PSnark acceptor");
           thread.setDaemon(true);
           thread.start();
-          _util.getContext().simpleScheduler().addPeriodicEvent(new Cleaner(), BAD_CLEAN_INTERVAL);
+          _cleaner.schedule(BAD_CLEAN_INTERVAL);
       }
     }
   }
   
+  /**
+   *  Unused (single torrent)
+   */
   public ConnectionAcceptor(I2PSnarkUtil util, I2PServerSocket serverSocket,
                             PeerAcceptor peeracceptor)
   {
@@ -82,7 +92,7 @@ class ConnectionAcceptor implements Runnable
     thread = new I2PAppThread(this, "I2PSnark acceptor");
     thread.setDaemon(true);
     thread.start();
-    _util.getContext().simpleScheduler().addPeriodicEvent(new Cleaner(), BAD_CLEAN_INTERVAL);
+    _cleaner = new Cleaner();
   }
 
   public void halt()
@@ -101,14 +111,20 @@ class ConnectionAcceptor implements Runnable
     Thread t = thread;
     if (t != null)
       t.interrupt();
+    _cleaner.cancel();
   }
   
+  /**
+   *  Effectively unused, would only be called if we changed
+   *  I2CP host/port, which is hidden in the gui if in router context
+   */
   public void restart() {
       serverSocket = _util.getServerSocket();
       socketChanged = true;
       Thread t = thread;
       if (t != null)
           t.interrupt();
+      _cleaner.schedule(BAD_CLEAN_INTERVAL);
   }
 
   public int getPort()
@@ -150,9 +166,11 @@ class ConnectionAcceptor implements Runnable
                     try { socket.close(); } catch (IOException ioe) {}
                     continue;
                 }
-                if (_badCounter.count(socket.getPeerDestination().calculateHash()) >= MAX_BAD) {
+                int bad = _badCounter.count(socket.getPeerDestination().calculateHash());
+                if (bad >= MAX_BAD) {
                     if (_log.shouldLog(Log.WARN))
-                        _log.warn("Rejecting connection from " + socket.getPeerDestination().calculateHash() + " after " + MAX_BAD + " failures");
+                        _log.warn("Rejecting connection from " + socket.getPeerDestination().calculateHash() +
+                                  " after " + bad + " failures, max is " + MAX_BAD);
                     try { socket.close(); } catch (IOException ioe) {}
                     continue;
                 }
@@ -214,7 +232,17 @@ class ConnectionAcceptor implements Runnable
   }
 
     /** @since 0.9.1 */    
-    private class Cleaner implements SimpleTimer.TimedEvent {
-        public void timeReached() { _badCounter.clear(); }
+    private class Cleaner extends SimpleTimer2.TimedEvent {
+
+        public Cleaner() {
+            super(_util.getContext().simpleTimer2());
+        }
+
+        public void timeReached() {
+            if (stop)
+                return;
+            _badCounter.clear();
+            schedule(BAD_CLEAN_INTERVAL);
+        }
     }
 }

apps/i2psnark/java/src/org/klomp/snark/CoordinatorListener.java

@@ -37,8 +37,20 @@ interface CoordinatorListener
    */
   void gotMetaInfo(PeerCoordinator coordinator, MetaInfo metainfo);
 
+  /**
+   * Is this number of uploaders over the per-torrent limit?
+   */
   public boolean overUploadLimit(int uploaders);
+
+  /**
+   * Are we currently over the upstream bandwidth limit?
+   */
   public boolean overUpBWLimit();
+
+  /**
+   * Is the total (in Bps) over the upstream bandwidth limit?
+   */
   public boolean overUpBWLimit(long total);
+
   public void addMessage(String message);
 }

apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java

@@ -158,7 +158,7 @@ public class I2PSnarkUtil {
     }
     
     /**
-     *  This updates the session options and tells the router
+     *  This updates ALL the session options (not just the bw) and tells the router
      *  @param limit KBps
      */
     public void setMaxUpBW(int limit) {

apps/i2psnark/java/src/org/klomp/snark/IdleChecker.java

@@ -0,0 +1,120 @@
+/*
+ * Released into the public domain 
+ * with no warranty of any kind, either expressed or implied.  
+ */
+package org.klomp.snark;
+
+import java.util.Map;
+import java.util.Properties;
+
+import net.i2p.client.I2PSession;
+import net.i2p.client.streaming.I2PSocketManager;
+import net.i2p.util.Log;
+import net.i2p.util.SimpleTimer2;
+
+/**
+ *  Periodically check for idle condition based on connected peers,
+ *  and reduce/restore tunnel count as necessary.
+ *  We can't use the I2CP idle detector because it's based on traffic,
+ *  so DHT and announces would keep it non-idle.
+ *
+ *  @since 0.9.7
+ */
+class IdleChecker extends SimpleTimer2.TimedEvent {
+
+    private final I2PSnarkUtil _util;
+    private final PeerCoordinatorSet _pcs;
+    private final Log _log;
+    private int _consec;
+    private boolean _isIdle;
+
+    private static final long CHECK_TIME = 63*1000;
+    private static final int MAX_CONSEC_IDLE = 4;
+
+    /**
+     *  Caller must schedule
+     */
+    public IdleChecker(I2PSnarkUtil util, PeerCoordinatorSet pcs) {
+        super(util.getContext().simpleTimer2());
+        _log = util.getContext().logManager().getLog(IdleChecker.class);
+        _util = util;
+        _pcs = pcs;
+    }
+
+    public void timeReached() {
+        if (_util.connected()) {
+            boolean hasPeers = false;
+            for (PeerCoordinator pc : _pcs) {
+                if (pc.getPeers() > 0) {
+                    hasPeers = true;
+                    break;
+                }
+            }
+            if (hasPeers) {
+                if (_isIdle)
+                    restoreTunnels();
+            } else {
+                if (!_isIdle) {
+                    if (_consec++ >= MAX_CONSEC_IDLE)
+                        reduceTunnels();
+                }
+            }
+        } else {
+            _isIdle = false;
+            _consec = 0;
+        }
+        schedule(CHECK_TIME);
+    }
+
+    /**
+     *  Reduce to 1 in / 1 out tunnel
+     */
+    private void reduceTunnels() {
+        _isIdle = true;
+        if (_log.shouldLog(Log.INFO))
+            _log.info("Reducing tunnels on idle");
+        setTunnels("1", "1", "0", "0");
+    }
+    
+    /**
+     *  Restore tunnel count
+     */
+    private void restoreTunnels() {
+        _isIdle = false;
+        if (_log.shouldLog(Log.INFO))
+            _log.info("Restoring tunnels on activity");
+        Map<String, String> opts = _util.getI2CPOptions();
+        String i = opts.get("inbound.quantity");
+        if (i == null)
+            i = "3";
+        String o = opts.get("outbound.quantity");
+        if (o == null)
+            o = "3";
+        String ib = opts.get("inbound.backupQuantity");
+        if (ib == null)
+            ib = "0";
+        String ob= opts.get("outbound.backupQuantity");
+        if (ob == null)
+            ob = "0";
+        setTunnels(i, o, ib, ob);
+    }
+    
+    /**
+     *  Set in / out / in backup / out backup tunnel counts
+     */
+    private void setTunnels(String i, String o, String ib, String ob) {
+        _consec = 0;
+        I2PSocketManager mgr = _util.getSocketManager();
+        if (mgr != null) {
+            I2PSession sess = mgr.getSession();
+            if (sess != null) {
+                Properties newProps = new Properties();
+                newProps.setProperty("inbound.quantity", i);
+                newProps.setProperty("outbound.quantity", o);
+                newProps.setProperty("inbound.backupQuantity", ib);
+                newProps.setProperty("outbound.backupQuantity", ob);
+                sess.updateOptions(newProps);
+            }
+        }
+    }
+}

apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java

@@ -62,6 +62,9 @@ public class MetaInfo
   private final long length;
   private final boolean privateTorrent;
   private final List<List<String>> announce_list;
+  private final String comment;
+  private final String created_by;
+  private final long creation_date;
   private Map<String, BEValue> infoMap;
 
   /**
@@ -87,6 +90,9 @@ public class MetaInfo
     this.length = length;
     this.privateTorrent = privateTorrent;
     this.announce_list = announce_list;
+    this.comment = null;
+    this.created_by = null;
+    this.creation_date = 0;
 
     // TODO if we add a parameter for other keys
     //if (other != null) {
@@ -162,6 +168,32 @@ public class MetaInfo
         }
     }
 
+    // misc. optional  top-level stuff
+    val = m.get("comment");
+    String st = null;
+    if (val != null) {
+        try {
+            st = val.getString();
+        } catch (InvalidBEncodingException ibee) {}
+    }
+    this.comment = st;
+    val = m.get("created by");
+    st = null;
+    if (val != null) {
+        try {
+            st = val.getString();
+        } catch (InvalidBEncodingException ibee) {}
+    }
+    this.created_by = st;
+    val = m.get("creation date");
+    long time = 0;
+    if (val != null) {
+        try {
+            time = val.getLong() * 1000;
+        } catch (InvalidBEncodingException ibee) {}
+    }
+    this.creation_date = time;
+
     val = m.get("info");
     if (val == null)
         throw new InvalidBEncodingException("Missing info map");
@@ -381,6 +413,33 @@ public class MetaInfo
     return lengths;
   }
 
+  /**
+   * The comment string or null.
+   * Not available for locally-created torrents.
+   * @since 0.9.7
+   */
+  public String getComment() {
+      return this.comment;
+  }
+
+  /**
+   * The created-by string or null.
+   * Not available for locally-created torrents.
+   * @since 0.9.7
+   */
+  public String getCreatedBy() {
+      return this.created_by;
+  }
+
+  /**
+   * The creation date (ms) or zero.
+   * Not available for locally-created torrents.
+   * @since 0.9.7
+   */
+  public long getCreationDate() {
+      return this.creation_date;
+  }
+
   /**
    * Returns the number of pieces.
    */
@@ -501,12 +560,17 @@ public class MetaInfo
    * Creates a copy of this MetaInfo that shares everything except the
    * announce URL.
    * Drops any announce-list.
+   * Preserves infohash and info map, including any non-standard fields.
+   * @param announce may be null
    */
-  public MetaInfo reannounce(String announce)
+  public MetaInfo reannounce(String announce) throws InvalidBEncodingException
   {
-    return new MetaInfo(announce, name, name_utf8, files,
-                        lengths, piece_length,
-                        piece_hashes, length, privateTorrent, null);
+        Map<String, BEValue> m = new HashMap();
+        if (announce != null)
+            m.put("announce", new BEValue(DataHelper.getUTF8(announce)));
+        Map info = createInfoMap();
+        m.put("info", new BEValue(info));
+        return new MetaInfo(m);
   }
 
   /**
@@ -539,6 +603,9 @@ public class MetaInfo
     // or else we will lose any non-standard keys and corrupt the infohash.
     if (infoMap != null)
         return Collections.unmodifiableMap(infoMap);
+    // we should only get here if serving a magnet on a torrent we created
+    if (_log.shouldLog(Log.WARN))
+        _log.warn("Creating new infomap", new Exception());
     // otherwise we must create it
     Map info = new HashMap();
     info.put("name", name);

apps/i2psnark/java/src/org/klomp/snark/PeerCoordinatorSet.java

@@ -12,7 +12,7 @@ import net.i2p.crypto.SHA1Hash;
  * Each PeerCoordinator is added to the set from within the Snark (and removed
  * from it there too)
  */
-class PeerCoordinatorSet {
+class PeerCoordinatorSet implements Iterable<PeerCoordinator> {
     private final Map<SHA1Hash, PeerCoordinator> _coordinators;
     
     public PeerCoordinatorSet() {

apps/i2psnark/java/src/org/klomp/snark/PeerMonitorTask.java

@@ -27,6 +27,8 @@ import net.i2p.data.DataHelper;
 /**
  * TimerTask that monitors the peers and total up/download speeds.
  * Works together with the main Snark class to report periodical statistics.
+ *
+ * @deprecated unused, for command line client only, commented out in Snark.java
  */
 class PeerMonitorTask implements Runnable
 {
@@ -45,6 +47,7 @@ class PeerMonitorTask implements Runnable
 
   public void run()
   {
+/*****
     // Get some statistics
     int peers = 0;
     int uploaders = 0;
@@ -117,5 +120,6 @@ class PeerMonitorTask implements Runnable
 
     lastDownloaded = downloaded;
     lastUploaded = uploaded;
+****/
   }
 }

apps/i2psnark/java/src/org/klomp/snark/Snark.java

@@ -1226,8 +1226,7 @@ public class Snark
     if (_peerCoordinatorSet == null || uploaders <= 0)
       return false;
     int totalUploaders = 0;
-    for (Iterator<PeerCoordinator> iter = _peerCoordinatorSet.iterator(); iter.hasNext(); ) {
-      PeerCoordinator c = iter.next();
+    for (PeerCoordinator c : _peerCoordinatorSet) {
       if (!c.halted())
         totalUploaders += c.uploaders;
     }
@@ -1240,8 +1239,7 @@ public class Snark
     if (_peerCoordinatorSet == null)
       return false;
     long total = 0;
-    for (Iterator<PeerCoordinator> iter = _peerCoordinatorSet.iterator(); iter.hasNext(); ) {
-      PeerCoordinator c = iter.next();
+    for (PeerCoordinator c : _peerCoordinatorSet) {
       if (!c.halted())
         total += c.getCurrentUploadRate();
     }

apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java

@@ -37,6 +37,7 @@ import net.i2p.util.SecureDirectory;
 import net.i2p.util.SecureFileOutputStream;
 import net.i2p.util.SimpleScheduler;
 import net.i2p.util.SimpleTimer;
+import net.i2p.util.SimpleTimer2;
 
 import org.klomp.snark.dht.DHT;
 
@@ -70,6 +71,7 @@ public class SnarkManager implements CompleteListener {
     private final Map<String, Tracker> _trackerMap;
     private UpdateManager _umgr;
     private UpdateHandler _uhandler;
+    private SimpleTimer2.TimedEvent _idleChecker;
     
     public static final String PROP_I2CP_HOST = "i2psnark.i2cpHost";
     public static final String PROP_I2CP_PORT = "i2psnark.i2cpPort";
@@ -178,6 +180,8 @@ public class SnarkManager implements CompleteListener {
             _context.simpleScheduler().addEvent(new Register(), 4*60*1000);
         // Not required, Jetty has a shutdown hook
         //_context.addShutdownTask(new SnarkManagerShutdown());
+        _idleChecker = new IdleChecker(_util, _peerCoordinatorSet);
+        _idleChecker.schedule(5*60*1000);
     }
 
     /** @since 0.9.4 */
@@ -210,6 +214,7 @@ public class SnarkManager implements CompleteListener {
         _running = false;
         _monitor.interrupt();
         _connectionAcceptor.halt();
+        _idleChecker.cancel();
         stopAllTorrents(true);
     }
     
@@ -635,6 +640,7 @@ public class SnarkManager implements CompleteListener {
                     addMessage(_("I2CP options changed to {0}", i2cpOpts));
                     _util.setI2CPConfig(oldI2CPHost, oldI2CPPort, opts);
                 } else {
+                    // Won't happen, I2CP host/port, are hidden in the GUI if in router context
                     if (_util.connected()) {
                         _util.disconnect();
                         addMessage(_("Disconnecting old I2CP destination"));
@@ -658,6 +664,8 @@ public class SnarkManager implements CompleteListener {
                         for (Snark snark : _snarks.values()) {
                             if (snark.restartAcceptor()) {
                                 addMessage(_("I2CP listener restarted for \"{0}\"", snark.getBaseName()));
+                                // this is the common ConnectionAcceptor, so we only need to do it once
+                                break;
                             }
                         }
                     }
@@ -1855,6 +1863,14 @@ public class SnarkManager implements CompleteListener {
         private final Snark snark;
         public ThreadedStarter(Snark s) { snark = s; }
         public void run() {
+            try {
+                run2();
+            } catch (Exception e) {
+                _log.error("Error starting", e);
+            }
+        }
+
+        private void run2() {
             if (snark != null) {
                 if (snark.isStopped())
                     snark.startTorrent();

apps/i2psnark/java/src/org/klomp/snark/Storage.java

@@ -78,8 +78,8 @@ public class Storage
 
   /** The default piece size. */
   private static final int DEFAULT_PIECE_SIZE = 256*1024;
-  /** note that we start reducing max number of peer connections above 1MB */
-  public static final int MAX_PIECE_SIZE = 2*1024*1024;
+  /** bigger than this will be rejected */
+  public static final int MAX_PIECE_SIZE = 4*1024*1024;
   /** The maximum number of pieces in a torrent. */
   public static final int MAX_PIECES = 10*1024;
   public static final long MAX_TOTAL_SIZE = MAX_PIECE_SIZE * (long) MAX_PIECES;
@@ -179,8 +179,7 @@ public class Storage
         files.add(file);
       }
 
-    if (files.size() == 1) // FIXME: ...and if base file not a directory or should this be the only check?
-                           // this makes a bad metainfo if the directory has only one file in it
+    if (files.size() == 1 && !baseFile.isDirectory())
       {
         files = null;
         lengthsList = null;

apps/i2psnark/java/src/org/klomp/snark/UpdateRunner.java

@@ -111,7 +111,7 @@ class UpdateRunner implements UpdateTask, CompleteListener {
                 }
                 _snark = _smgr.addMagnet(name, ih, trackerURL, true, true, this);
                 if (_snark != null) {
-                    updateStatus("<b>" + _smgr.util().getString("Updating from {0}", updateURL) + "</b>");
+                    updateStatus("<b>" + _smgr.util().getString("Updating from {0}", linkify(updateURL)) + "</b>");
                     new Timeout();
                     break;
                 }
@@ -291,6 +291,12 @@ class UpdateRunner implements UpdateTask, CompleteListener {
 
     //////// end CompleteListener methods
 
+    private static String linkify(String url) {
+        String durl = url.length() <= 28 ? url :
+                                           url.substring(0, 25) + "&hellip;";
+        return "<a target=\"_blank\" href=\"" + url + "\"/>" + durl + "</a>";
+    }
+
     private void updateStatus(String s) {
         _umgr.notifyProgress(this, s);
     }

apps/i2psnark/java/src/org/klomp/snark/bencode/BDecoder.java

@@ -221,46 +221,51 @@ public class BDecoder
       {
         c = read();
         if (c == 'e')
-          return new BEValue(BigInteger.ZERO);
+          return new BEValue(Integer.valueOf(0));
         else
           throw new InvalidBEncodingException("'e' expected after zero,"
                                               + " not '" + (char)c + "'");
       }
 
     // XXX - We don't support more the 255 char big integers
-    char[] chars = new char[256];
-    int off = 0;
+    StringBuilder chars = new StringBuilder(16);
 
     if (c == '-')
       {
         c = read();
         if (c == '0')
           throw new InvalidBEncodingException("Negative zero not allowed");
-        chars[off] = (char)c;
-        off++;
+        chars.append((char)c);
       }
 
     if (c < '1' || c > '9')
       throw new InvalidBEncodingException("Invalid Integer start '"
                                           + (char)c + "'");
-    chars[off] = (char)c;
-    off++;
+    chars.append((char)c);
 
     c = read();
-    int i = c - '0';
-    while(i >= 0 && i <= 9)
+    while(c >= '0' && c <= '9')
       {
-        chars[off] = (char)c;
-        off++;
+        chars.append((char)c);
         c = read();
-        i = c - '0';
       }
 
     if (c != 'e')
       throw new InvalidBEncodingException("Integer should end with 'e'");
 
-    String s = new String(chars, 0, off);
-    return new BEValue(new BigInteger(s));
+    String s = chars.toString();
+    int len = s.length();
+    // save a little space if we're sure it will fit
+    Number num;
+    if (len < 10)
+        num = Integer.valueOf(s);
+    else if (len < 19)
+        num = Long.valueOf(s);
+    else if (len > 256)
+        throw new InvalidBEncodingException("Too many digits: " + len);
+    else
+        num = new BigInteger(s);
+    return new BEValue(num);
   }
 
   /**

apps/i2psnark/java/src/org/klomp/snark/web/BasicServlet.java

@@ -38,6 +38,7 @@ import net.i2p.I2PAppContext;
 import net.i2p.data.ByteArray;
 import net.i2p.util.ByteCache;
 import net.i2p.util.Log;
+import net.i2p.util.SystemVersion;
 
 
 /* ------------------------------------------------------------ */
@@ -528,7 +529,10 @@ class BasicServlet extends HttpServlet
     protected static String addPaths(String base, String path) {
         if (path == null)
             return base;
-        return (new File(base, path)).toString();
+        String rv = (new File(base, path)).toString();
+        if (SystemVersion.isWindows())
+            rv = rv.replace("\\", "/");
+        return rv;
     }
 
     /**

apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

@@ -9,10 +9,12 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.text.Collator;
 import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
@@ -502,6 +504,23 @@ public class I2PSnarkServlet extends BasicServlet {
             out.write("\">");
             if (isDegraded)
                 out.write("</a>");
+            for (Snark s : snarks) {
+                if (s.isStopped()) {
+                    // show startall too
+                    out.write("<br>");
+                    if (isDegraded)
+                        out.write("<a href=\"/" + _contextPath + "/?action=StartAll&amp;nonce=" + _nonce + "\"><img title=\"");
+                    else
+                        out.write("<input type=\"image\" name=\"action_StartAll\" value=\"foo\" title=\"");
+                    out.write(_("Start all stopped torrents"));
+                    out.write("\" src=\"" + _imgPath + "start_all.png\" alt=\"");
+                    out.write(_("Start All"));
+                    out.write("\">");
+                    if (isDegraded)
+                        out.write("</a>");
+                    break;
+                }
+            }
         } else if ((!_manager.util().isConnecting()) && !snarks.isEmpty()) {
             if (isDegraded)
                 out.write("<a href=\"/" + _contextPath + "/?action=StartAll&amp;nonce=" + _nonce + "\"><img title=\"");
@@ -1226,10 +1245,10 @@ public class I2PSnarkServlet extends BasicServlet {
         String statusString;
         if (snark.isChecking()) {
             statusString = "<img alt=\"\" border=\"0\" src=\"" + _imgPath + "stalled.png\" title=\"" + _("Checking") + "\"></td>" +
-                           "<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("Checking");
+                           "<td class=\"snarkTorrentStatus\">" + _("Checking");
         } else if (snark.isAllocating()) {
             statusString = "<img alt=\"\" border=\"0\" src=\"" + _imgPath + "stalled.png\" title=\"" + _("Allocating") + "\"></td>" +
-                           "<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("Allocating");
+                           "<td class=\"snarkTorrentStatus\">" + _("Allocating");
         } else if (err != null && curPeers == 0) {
             // Also don't show if seeding... but then we won't see the not-registered error
             //       && remaining != 0 && needed != 0) {
@@ -1243,18 +1262,18 @@ public class I2PSnarkServlet extends BasicServlet {
             //else if (isRunning)
             if (isRunning)
                 statusString = "<img alt=\"\" border=\"0\" src=\"" + _imgPath + "trackererror.png\" title=\"" + err + "\"></td>" +
-                               "<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("Tracker Error") +
+                               "<td class=\"snarkTorrentStatus\">" + _("Tracker Error") +
                                ": " + curPeers + thinsp(noThinsp) +
                                ngettext("1 peer", "{0} peers", knownPeers);
             else {
                 if (err.length() > MAX_DISPLAYED_ERROR_LENGTH)
                     err = err.substring(0, MAX_DISPLAYED_ERROR_LENGTH) + "&hellip;";
                 statusString = "<img alt=\"\" border=\"0\" src=\"" + _imgPath + "trackererror.png\" title=\"" + err + "\"></td>" +
-                               "<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("Tracker Error");
+                               "<td class=\"snarkTorrentStatus\">" + _("Tracker Error");
             }
         } else if (snark.isStarting()) {
             statusString = "<img alt=\"\" border=\"0\" src=\"" + _imgPath + "stalled.png\" title=\"" + _("Starting") + "\"></td>" +
-                           "<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("Starting");
+                           "<td class=\"snarkTorrentStatus\">" + _("Starting");
         } else if (remaining == 0 || needed == 0) {  // < 0 means no meta size yet
             // partial complete or seeding
             if (isRunning) {
@@ -1270,60 +1289,60 @@ public class I2PSnarkServlet extends BasicServlet {
                 }
                 if (curPeers > 0 && !showPeers)
                     statusString = "<img alt=\"\" border=\"0\" src=\"" + _imgPath + img + ".png\" title=\"" + txt + "\"></td>" +
-                               "<td class=\"snarkTorrentStatus " + rowClass + "\">" + txt +
+                               "<td class=\"snarkTorrentStatus\">" + txt +
                                ": <a href=\"" + uri + "?p=" + Base64.encode(snark.getInfoHash()) + stParam + "\">" +
                                curPeers + thinsp(noThinsp) +
                                ngettext("1 peer", "{0} peers", knownPeers) + "</a>";
                 else
                     statusString = "<img alt=\"\" border=\"0\" src=\"" + _imgPath + img + ".png\" title=\"" + txt + "\"></td>" +
-                               "<td class=\"snarkTorrentStatus " + rowClass + "\">" + txt +
+                               "<td class=\"snarkTorrentStatus\">" + txt +
                                ": " + curPeers + thinsp(noThinsp) +
                                ngettext("1 peer", "{0} peers", knownPeers);
             } else {
                 statusString = "<img alt=\"\" border=\"0\" src=\"" + _imgPath + "complete.png\" title=\"" + _("Complete") + "\"></td>" +
-                               "<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("Complete");
+                               "<td class=\"snarkTorrentStatus\">" + _("Complete");
             }
         } else {
             if (isRunning && curPeers > 0 && downBps > 0 && !showPeers)
                 statusString = "<img alt=\"\" border=\"0\" src=\"" + _imgPath + "downloading.png\" title=\"" + _("OK") + "\"></td>" +
-                               "<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("OK") +
+                               "<td class=\"snarkTorrentStatus\">" + _("OK") +
                                ": <a href=\"" + uri + "?p=" + Base64.encode(snark.getInfoHash()) + stParam + "\">" +
                                curPeers + thinsp(noThinsp) +
                                ngettext("1 peer", "{0} peers", knownPeers) + "</a>";
             else if (isRunning && curPeers > 0 && downBps > 0)
                 statusString = "<img alt=\"\" border=\"0\" src=\"" + _imgPath + "downloading.png\" title=\"" + _("OK") + "\"></td>" +
-                               "<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("OK") +
+                               "<td class=\"snarkTorrentStatus\">" + _("OK") +
                                ": " + curPeers + thinsp(noThinsp) +
                                ngettext("1 peer", "{0} peers", knownPeers);
             else if (isRunning && curPeers > 0 && !showPeers)
                 statusString = "<img alt=\"\" border=\"0\" src=\"" + _imgPath + "stalled.png\" title=\"" + _("Stalled") + "\"></td>" +
-                               "<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("Stalled") +
+                               "<td class=\"snarkTorrentStatus\">" + _("Stalled") +
                                ": <a href=\"" + uri + "?p=" + Base64.encode(snark.getInfoHash()) + stParam + "\">" +
                                curPeers + thinsp(noThinsp) +
                                ngettext("1 peer", "{0} peers", knownPeers) + "</a>";
             else if (isRunning && curPeers > 0)
                 statusString = "<img alt=\"\" border=\"0\" src=\"" + _imgPath + "stalled.png\" title=\"" + _("Stalled") + "\"></td>" +
-                               "<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("Stalled") +
+                               "<td class=\"snarkTorrentStatus\">" + _("Stalled") +
                                ": " + curPeers + thinsp(noThinsp) +
                                ngettext("1 peer", "{0} peers", knownPeers);
             else if (isRunning && knownPeers > 0)
                 statusString = "<img alt=\"\" border=\"0\" src=\"" + _imgPath + "nopeers.png\" title=\"" + _("No Peers") + "\"></td>" +
-                               "<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("No Peers") +
+                               "<td class=\"snarkTorrentStatus\">" + _("No Peers") +
                                ": 0" + thinsp(noThinsp) + knownPeers ;
             else if (isRunning)
                 statusString = "<img alt=\"\" border=\"0\" src=\"" + _imgPath + "nopeers.png\" title=\"" + _("No Peers") + "\"></td>" +
-                               "<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("No Peers");
+                               "<td class=\"snarkTorrentStatus\">" + _("No Peers");
             else
                 statusString = "<img alt=\"\" border=\"0\" src=\"" + _imgPath + "stopped.png\" title=\"" + _("Stopped") + "\"></td>" +
-                               "<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("Stopped");
+                               "<td class=\"snarkTorrentStatus\">" + _("Stopped");
         }
         
         out.write("<tr class=\"" + rowClass + "\">");
-        out.write("<td class=\"center " + rowClass + "\">");
+        out.write("<td class=\"center\">");
         out.write(statusString + "</td>\n\t");
 
         // (i) icon column
-        out.write("<td class=\"" + rowClass + "\">");
+        out.write("<td>");
         if (isValid && meta.getAnnounce() != null) {
             // Link to local details page - note that trailing slash on a single-file torrent
             // gets us to the details page instead of the file.
@@ -1342,7 +1361,7 @@ public class I2PSnarkServlet extends BasicServlet {
 
         String encodedBaseName = urlEncode(snark.getBaseName());
         // File type icon column
-        out.write("</td>\n<td class=\"" + rowClass + "\">");
+        out.write("</td>\n<td>");
         if (isValid) {
             // Link to local details page - note that trailing slash on a single-file torrent
             // gets us to the details page instead of the file.
@@ -1369,7 +1388,7 @@ public class I2PSnarkServlet extends BasicServlet {
         }
 
         // Torrent name column
-        out.write("</td><td class=\"snarkTorrentName " + rowClass + "\">");
+        out.write("</td><td class=\"snarkTorrentName\">");
         if (remaining == 0 || isMultiFile) {
             StringBuilder buf = new StringBuilder(128);
             buf.append("<a href=\"").append(encodedBaseName);
@@ -1387,11 +1406,11 @@ public class I2PSnarkServlet extends BasicServlet {
         if (remaining == 0 || isMultiFile)
             out.write("</a>");
 
-        out.write("<td align=\"right\" class=\"snarkTorrentETA " + rowClass + "\">");
+        out.write("<td align=\"right\" class=\"snarkTorrentETA\">");
         if(isRunning && remainingSeconds > 0 && !snark.isChecking())
             out.write(DataHelper.formatDuration2(Math.max(remainingSeconds, 10) * 1000)); // (eta 6h)
         out.write("</td>\n\t");
-        out.write("<td align=\"right\" class=\"snarkTorrentDownloaded " + rowClass + "\">");
+        out.write("<td align=\"right\" class=\"snarkTorrentDownloaded\">");
         if (remaining > 0)
             out.write(formatSize(total-remaining) + thinsp(noThinsp) + formatSize(total));
         else if (remaining == 0)
@@ -1399,7 +1418,7 @@ public class I2PSnarkServlet extends BasicServlet {
         //else
         //    out.write("??");  // no meta size yet
         out.write("</td>\n\t");
-        out.write("<td align=\"right\" class=\"snarkTorrentUploaded " + rowClass + "\">");
+        out.write("<td align=\"right\" class=\"snarkTorrentUploaded\">");
         if(isRunning && isValid)
            out.write(formatSize(uploaded));
         out.write("</td>\n\t");
@@ -1411,7 +1430,7 @@ public class I2PSnarkServlet extends BasicServlet {
         if(isRunning && isValid)
             out.write(formatSize(upBps) + "ps");
         out.write("</td>\n\t");
-        out.write("<td align=\"center\" class=\"snarkTorrentAction " + rowClass + "\">");
+        out.write("<td align=\"center\" class=\"snarkTorrentAction\">");
         String b64 = Base64.encode(snark.getInfoHash());
         if (snark.isChecking()) {
             // show no buttons
@@ -1492,7 +1511,7 @@ public class I2PSnarkServlet extends BasicServlet {
                 if (!peer.isConnected())
                     continue;
                 out.write("<tr class=\"" + rowClass + "\"><td></td>");
-                out.write("<td colspan=\"4\" align=\"right\" class=\"" + rowClass + "\">");
+                out.write("<td colspan=\"4\" align=\"right\">");
                 String ch = peer.toString().substring(0, 4);
                 String client;
                 if ("AwMD".equals(ch))
@@ -1517,13 +1536,13 @@ public class I2PSnarkServlet extends BasicServlet {
                 if (showDebug)
                     out.write(" inactive " + (peer.getInactiveTime() / 1000) + "s");
                 out.write("</td>\n\t");
-                out.write("<td class=\"snarkTorrentStatus " + rowClass + "\">");
+                out.write("<td class=\"snarkTorrentStatus\">");
                 out.write("</td>\n\t");
-                out.write("<td align=\"right\" class=\"snarkTorrentStatus " + rowClass + "\">");
+                out.write("<td align=\"right\" class=\"snarkTorrentStatus\">");
                 float pct;
                 if (isValid) {
                     pct = (float) (100.0 * peer.completed() / meta.getPieces());
-                    if (pct == 100.0)
+                    if (pct >= 100.0)
                         out.write(_("Seed"));
                     else {
                         String ps = String.valueOf(pct);
@@ -1537,9 +1556,9 @@ public class I2PSnarkServlet extends BasicServlet {
                     //out.write("??");
                 }
                 out.write("</td>\n\t");
-                out.write("<td class=\"snarkTorrentStatus " + rowClass + "\">");
+                out.write("<td class=\"snarkTorrentStatus\">");
                 out.write("</td>\n\t");
-                out.write("<td align=\"right\" class=\"snarkTorrentStatus " + rowClass + "\">");
+                out.write("<td align=\"right\" class=\"snarkTorrentStatus\">");
                 if (needed > 0) {
                     if (peer.isInteresting() && !peer.isChoked()) {
                         out.write("<span class=\"unchoked\">");
@@ -1561,7 +1580,7 @@ public class I2PSnarkServlet extends BasicServlet {
                     //}
                 }
                 out.write("</td>\n\t");
-                out.write("<td align=\"right\" class=\"snarkTorrentStatus " + rowClass + "\">");
+                out.write("<td align=\"right\" class=\"snarkTorrentStatus\">");
                 if (isValid && pct < 100.0) {
                     if (peer.isInterested() && !peer.isChoking()) {
                         out.write("<span class=\"unchoked\">");
@@ -1577,10 +1596,10 @@ public class I2PSnarkServlet extends BasicServlet {
                     }
                 }
                 out.write("</td>\n\t");
-                out.write("<td class=\"snarkTorrentStatus " + rowClass + "\">");
+                out.write("<td class=\"snarkTorrentStatus\">");
                 out.write("</td></tr>\n\t");
                 if (showDebug)
-                    out.write("<tr class=\"" + rowClass + "\"><td></td><td colspan=\"10\" align=\"right\" class=\"" + rowClass + "\">" + peer.getSocket() + "</td></tr>");
+                    out.write("<tr class=\"" + rowClass + "\"><td></td><td colspan=\"10\" align=\"right\">" + peer.getSocket() + "</td></tr>");
             }
         }
     }
@@ -2164,7 +2183,8 @@ public class I2PSnarkServlet extends BasicServlet {
     
     /** @since 0.8.13 */
     private static String urlEncode(String s) {
-        return s.replace(";", "%3B").replace("&", "&amp;").replace(" ", "%20");
+        return s.replace(";", "%3B").replace("&", "&amp;").replace(" ", "%20")
+                .replace("[", "%5B").replace("]", "%5D");
     }
 
     private static final String DOCTYPE = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n";
@@ -2326,6 +2346,38 @@ public class I2PSnarkServlet extends BasicServlet {
                 }
             }
 
+            if (meta != null) {
+                String com = meta.getComment();
+                if (com != null) {
+                    if (com.length() > 1024)
+                        com = com.substring(0, 1024);
+                    buf.append("<tr><td><img alt=\"\" border=\"0\" src=\"")
+                       .append(_imgPath).append("details.png\"> <b>")
+                       .append(_("Comment")).append(":</b> ")
+                       .append(DataHelper.stripHTML(com))
+                       .append("</td></tr>\n");
+                }
+                long dat = meta.getCreationDate();
+                if (dat > 0) {
+                    String date = (new SimpleDateFormat("yyyy-MM-dd HH:mm")).format(new Date(dat));
+                    buf.append("<tr><td><img alt=\"\" border=\"0\" src=\"")
+                       .append(_imgPath).append("details.png\"> <b>")
+                       .append(_("Created")).append(":</b> ")
+                       .append(date).append(" UTC")
+                       .append("</td></tr>\n");
+                }
+                String cby = meta.getCreatedBy();
+                if (cby != null) {
+                    if (cby.length() > 128)
+                        cby = com.substring(0, 128);
+                    buf.append("<tr><td><img alt=\"\" border=\"0\" src=\"")
+                       .append(_imgPath).append("details.png\"> <b>")
+                       .append(_("Created By")).append(":</b> ")
+                       .append(DataHelper.stripHTML(cby))
+                       .append("</td></tr>\n");
+                }
+            }
+
             String hex = I2PSnarkUtil.toHex(snark.getInfoHash());
             if (meta == null || !meta.isPrivate()) {
                 buf.append("<tr><td><a href=\"")
@@ -2340,6 +2392,7 @@ public class I2PSnarkServlet extends BasicServlet {
                    .append(_("Private torrent"))
                    .append("</td></tr>\n");
             }
+
             // We don't have the hash of the torrent file
             //buf.append("<tr><td>").append(_("Maggot link")).append(": <a href=\"").append(MAGGOT).append(hex).append(':').append(hex).append("\">")
             //   .append(MAGGOT).append(hex).append(':').append(hex).append("</a></td></tr>");
@@ -2500,8 +2553,7 @@ public class I2PSnarkServlet extends BasicServlet {
                 path=addPaths(path,"/");
             String icon = toIcon(item);
 
-            buf.append("<TD class=\"snarkFileIcon ")
-               .append(rowClass).append("\">");
+            buf.append("<TD class=\"snarkFileIcon\">");
             if (complete) {
                 buf.append("<a href=\"").append(path).append("\">");
                 // thumbnail ?
@@ -2516,17 +2568,16 @@ public class I2PSnarkServlet extends BasicServlet {
             } else {
                 buf.append(toImg(icon));
             }
-            buf.append("</TD><TD class=\"snarkFileName ")
-               .append(rowClass).append("\">");
+            buf.append("</TD><TD class=\"snarkFileName\">");
             if (complete)
                 buf.append("<a href=\"").append(path).append("\">");
             buf.append(item.getName());
             if (complete)
                 buf.append("</a>");
-            buf.append("</TD><TD ALIGN=right class=\"").append(rowClass).append(" snarkFileSize\">");
+            buf.append("</TD><TD ALIGN=right class=\"snarkFileSize\">");
             if (!item.isDirectory())
                 buf.append(DataHelper.formatSize2(length)).append('B');
-            buf.append("</TD><TD class=\"").append(rowClass).append(" snarkFileStatus\">");
+            buf.append("</TD><TD class=\"snarkFileStatus\">");
             //buf.append(dfmt.format(new Date(item.lastModified())));
             buf.append(status);
             buf.append("</TD>");
@@ -2591,7 +2642,8 @@ public class I2PSnarkServlet extends BasicServlet {
             icon = "html";
         else if (mime.equals("text/plain") ||
                  mime.equals("application/rtf") ||
-                 mime.equals("application/epub+zip"))
+                 mime.equals("application/epub+zip") ||
+                 mime.equals("application/x-mobipocket-ebook"))
             icon = "page";
         else if (mime.equals("application/java-archive") ||
                  plc.endsWith(".deb"))
@@ -2608,7 +2660,7 @@ public class I2PSnarkServlet extends BasicServlet {
             icon = "film";
         else if (mime.equals("application/zip") || mime.equals("application/x-gtar") ||
                  mime.equals("application/compress") || mime.equals("application/gzip") ||
-                 mime.equals("application/x-7z-compressed") || mime.equals("application/x-rar-compresed") ||
+                 mime.equals("application/x-7z-compressed") || mime.equals("application/x-rar-compressed") ||
                  mime.equals("application/x-tar") || mime.equals("application/x-bzip2"))
             icon = "compress";
         else if (plc.endsWith(".exe"))

apps/i2psnark/locale/messages_ar.po

@@ -12,7 +12,7 @@ msgstr ""
 "PO-Revision-Date: 2011-03-03 17:18-0000\n"
 "Last-Translator: hamada <hamada@mail.i2p>\n"
 "Language-Team: duck <duck@mail.i2p>\n"
-"Language: \n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

apps/i2psnark/mime.properties

@@ -1,5 +1,6 @@
 7z	= application/x-7z-compressed
 ape	= audio/x-monkeys-audio
+bz2	= application/x-bzip2
 dmg	= application/apple-diskimage
 epub	= application/epub+zip
 flac	= audio/flac
@@ -8,6 +9,7 @@ iso	= application/x-iso9660-image
 m4a	= audio/mp4a-latm
 m4v	= video/x-m4v
 mkv	= video/x-matroska
+mobi	= application/x-mobipocket-ebook
 mp4	= video/mp4
 mpc	= audio/x-musepack
 nfo	= text/plain
@@ -17,7 +19,9 @@ oga	= audio/ogg
 rar	= application/x-rar-compressed
 su2	= application/zip
 sud	= application/zip
+tbz	= application/x-bzip2
 txt	= text/plain
 war	= application/java-archive
+webm	= video/webm
 wma	= audio/x-ms-wma
 wmv	= video/x-ms-wmv

apps/i2ptunnel/java/build.xml

@@ -56,7 +56,7 @@
 
 
     <!-- The web classes are now in the war not the jar - they are not part of the API -->
-    <target name="jar" depends="builddep, compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
+    <target name="jar" depends="builddep, compile, bundle-proxy, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
         <!-- set if unset -->
         <property name="workspace.changes.j.tr" value="" />
         <jar destfile="./build/i2ptunnel.jar" basedir="./build/obj" includes="**/*.class" excludes="**/EditBean.class **/IndexBean.class" >
@@ -87,10 +87,12 @@
         </condition>
     </target>
 
+    <!-- servlet translations go in the war, not the jar -->
     <target name="bundle" depends="compile, precompilejsp" unless="no.bundle">
         <!-- Update the messages_*.po files.
              We need to supply the bat file for windows, and then change the fail property to true -->
         <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
+            <env key="JAVA_HOME" value="${java.home}" />
             <arg value="./bundle-messages.sh" />
         </exec>
         <exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="${require.gettext}" >
@@ -118,6 +120,50 @@
         </exec>
     </target>
 
+    <!-- proxy error page translations go in the jar, not the war -->
+    <target name="bundle-proxy" unless="no.bundle">
+        <!-- Update the messages_*.po files.
+             We need to supply the bat file for windows, and then change the fail property to true -->
+        <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
+            <env key="JAVA_HOME" value="${java.home}" />
+            <arg value="./bundle-messages-proxy.sh" />
+        </exec>
+        <exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="${require.gettext}" >
+            <arg value="./bundle-messages-proxy.sh" />
+        </exec>
+		<!-- multi-lang is optional -->
+        <exec executable="sh" osfamily="windows" failifexecutionfails="false" >
+            <arg value="./bundle-messages-proxy.sh" />
+        </exec>
+    </target>
+
+    <target name="extractProxyTags">
+        <java classname="net.i2p.util.TranslateReader" fork="true" failonerror="true">
+            <classpath>
+                <pathelement location="../../../build/i2p.jar" />
+            </classpath>
+            <arg value="tag" />
+            <arg value="../../../installer/resources/proxy/" />
+            <arg value="build/Proxy.java" />
+        </java>
+    </target>
+
+    <target name="poupdate-proxy" depends="extractProxyTags">
+        <!-- Update the messages_*.po files. -->
+        <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="true" >
+            <arg value="./bundle-messages-proxy.sh" />
+            <arg value="-p" />
+        </exec>
+        <exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="true" >
+            <arg value="./bundle-messages-proxy.sh" />
+            <arg value="-p" />
+        </exec>
+        <exec executable="sh" osfamily="windows" failifexecutionfails="true" failonerror="true" >
+            <arg value="./bundle-messages-proxy.sh" />
+            <arg value="-p" />
+        </exec>
+    </target>
+
     <target name="listChangedFiles2" depends="warUpToDate" if="shouldListChanges2" >
         <exec executable="mtn" outputproperty="workspace.changes.w" errorproperty="mtn.error2" failifexecutionfails="false" >
             <arg value="list" />
@@ -173,12 +219,10 @@
         <!-- there are various jspc ant tasks, but they all seem a bit flakey -->
         <java classname="org.apache.jasper.JspC" fork="true" failonerror="true">
             <classpath>
-                <pathelement location="../../jetty/jettylib/jasper-compiler.jar" />
                 <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
                 <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
                 <pathelement location="../../jetty/jettylib/commons-logging.jar" />
                 <pathelement location="../../jetty/jettylib/commons-el.jar" />
-                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
                 <pathelement location="${ant.home}/lib/ant.jar" />
                 <pathelement location="build/i2ptunnel.jar" />
                 <pathelement location="build/temp-beans.jar" />
@@ -203,7 +247,6 @@
                 <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
                 <pathelement location="../../jetty/jettylib/commons-logging.jar" />
                 <pathelement location="../../jetty/jettylib/commons-el.jar" />
-                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
                 <pathelement location="build/i2ptunnel.jar" />
                 <pathelement location="build/temp-beans.jar" />
                 <pathelement location="../../../core/java/build/i2p.jar" />

apps/i2ptunnel/java/bundle-messages-proxy.sh

@@ -0,0 +1,114 @@
+#!/bin/sh
+
+# Update messages_xx.po and messages_xx.class files,
+# from both java and jsp sources.
+# Requires installed programs xgettext, msgfmt, msgmerge, and find.
+#
+# usage:
+#    bundle-messages.sh (generates the resource bundle from the .po file)
+#    bundle-messages.sh -p (updates the .po file from the source tags, then generates the resource bundle)
+#
+# zzz - public domain
+#
+CLASS=net.i2p.i2ptunnel.proxy.messages
+TMPFILE=build/javafiles-proxy.txt
+export TZ=UTC
+RC=0
+
+if ! $(which javac > /dev/null 2>&1); then
+    export JAVAC=${JAVA_HOME}/../bin/javac
+fi
+
+if [ "$1" = "-p" ]
+then
+	POUPDATE=1
+fi
+
+# on windows, one must specify the path of commnad find
+# since windows has its own retarded version of find.
+if which find|grep -q -i windows ; then
+	export PATH=.:/bin:/usr/local/bin:$PATH
+fi
+# Fast mode - update ondemond
+# set LG2 to the language you need in envrionment varibales to enable this
+
+# add ../java/ so the refs will work in the po file
+JPATHS="../java/build/Proxy.java ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java"
+for i in ../locale-proxy/messages_*.po
+do
+	# get language
+	LG=${i#../locale-proxy/messages_}
+	LG=${LG%.po}
+
+	# skip, if specified
+	if [ $LG2 ]; then
+		[ $LG != $LG2 ] && continue || echo INFO: Language update is set to [$LG2] only.
+	fi
+
+	if [ "$POUPDATE" = "1" ]
+	then
+		# make list of java files newer than the .po file
+		find $JPATHS -name *.java -newer $i > $TMPFILE
+	fi
+	if [ -s build/obj/net/i2p/i2ptunnel/proxy/messages_$LG.class -a \
+	     build/obj/net/i2p/i2ptunnel/proxy/messages_$LG.class -nt $i -a \
+	     ! -s $TMPFILE ]
+	then
+		continue
+	fi
+
+	if [ "$POUPDATE" = "1" ]
+	then
+	 	echo "Updating the $i file from the tags..."
+		# extract strings from java and jsp files, and update messages.po files
+		# translate calls must be one of the forms:
+		# _("foo")
+		# _x("foo")
+		# intl._("foo")
+		# intl.title("foo")
+		# In a jsp, you must use a helper or handler that has the context set.
+		# To start a new translation, copy the header from an old translation to the new .po file,
+		# then ant distclean updater.
+		find $JPATHS -name *.java > $TMPFILE
+		xgettext -f $TMPFILE -F -L java --from-code=UTF-8 --add-comments\
+	                 --keyword=_ \
+		         -o ${i}t
+		if [ $? -ne 0 ]
+		then
+			echo "ERROR - xgettext failed on ${i}, not updating translations"
+			rm -f ${i}t
+			RC=1
+			break
+		fi
+		msgmerge -U --backup=none $i ${i}t
+		if [ $? -ne 0 ]
+		then
+			echo "ERROR - msgmerge failed on ${i}, not updating translations"
+			rm -f ${i}t
+			RC=1
+			break
+		fi
+		rm -f ${i}t
+		# so we don't do this again
+		touch $i
+	fi
+
+    if [ "$LG" != "en" ]
+    then
+        # only generate for non-source language
+        echo "Generating ${CLASS}_$LG ResourceBundle..."
+
+        # convert to class files in build/obj
+        msgfmt --java --statistics -r $CLASS -l $LG -d build/obj $i
+        if [ $? -ne 0 ]
+        then
+            echo "ERROR - msgfmt failed on ${i}, not updating translations"
+            # msgfmt leaves the class file there so the build would work the next time
+            find build/obj -name messages_${LG}.class -exec rm -f {} \;
+            RC=1
+            break
+        fi
+    fi
+done
+rm -f $TMPFILE
+exit $RC

apps/i2ptunnel/java/bundle-messages.sh

@@ -14,6 +14,9 @@ CLASS=net.i2p.i2ptunnel.web.messages
 TMPFILE=build/javafiles.txt
 export TZ=UTC
 RC=0
+if ! $(which javac > /dev/null 2>&1); then
+    export JAVAC="${JAVA_HOME}/../bin/javac"
+fi
 
 if [ "$1" = "-p" ]
 then
@@ -29,7 +32,7 @@ fi
 # set LG2 to the language you need in envrionment varibales to enable this
 
 # add ../java/ so the refs will work in the po file
-JPATHS="../java/src ../jsp/WEB-INF"
+JPATHS="../java/src/net/i2p/i2ptunnel/web ../jsp/WEB-INF"
 for i in ../locale/messages_*.po
 do
 	# get language

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java

@@ -255,9 +255,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
                 newManager = true;
             } else {
                 I2PSession sess = sockMgr.getSession();
-                if (sess == null) {
-                    newManager = true;
-                } else if (sess.isClosed() &&
+                if (sess.isClosed() &&
                            Boolean.parseBoolean(getTunnel().getClientOptions().getProperty("i2cp.closeOnIdle")) &&
                            Boolean.parseBoolean(getTunnel().getClientOptions().getProperty("i2cp.newDestOnResume"))) {
                     // build a new socket manager and a new dest if the session is closed.
@@ -317,7 +315,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
         Log _log = tunnel.getContext().logManager().getLog(I2PTunnelClientBase.class);
         if (socketManager != null) {
             I2PSession s = socketManager.getSession();
-            if ( (s == null) || (s.isClosed()) ) {
+            if (s.isClosed()) {
                 if (_log.shouldLog(Log.INFO))
                     _log.info(tunnel.getClientOptions().getProperty("inbound.nickname") + ": Building a new socket manager since the old one closed [s=" + s + "]");
                 if (s != null)
@@ -709,9 +707,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
                 }
                 if (!chained) {
                     I2PSession session = sockMgr.getSession();
-                    if (session != null) {
-                        getTunnel().removeSession(session);
-                    }
+                    getTunnel().removeSession(session);
                 } // else the app chaining to this one closes it!
             }
             l.log("Stopping client " + toString());

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java

@@ -287,6 +287,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
         _context.statManager().createRateStat("i2ptunnel.httpExpanded", "size transferred after expansion", "I2PTunnel", new long[] { 60*60*1000 });
         super.startRunning();
         this.isr = new InternalSocketRunner(this);
+        this.isr.start();
         _context.portMapper().register(PortMapper.SVC_HTTP_PROXY, getLocalPort());
     }
 
@@ -921,7 +922,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                 // use existing session to look up for efficiency
                 verifySocketManager();
                 I2PSession sess = sockMgr.getSession();
-                if(sess != null && !sess.isClosed()) {
+                if(!sess.isClosed()) {
                     byte[] hData = Base32.decode(destination.substring(0, 52));
                     if(hData != null) {
                         if(_log.shouldLog(Log.INFO)) {
@@ -1180,10 +1181,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                     out.write((":</b> " + wwwProxy).getBytes());
                 }
                 if(jumpServers != null && jumpServers.length() > 0) {
-                    out.write("<br><br>".getBytes());
-                    out.write(_("Click a link below to look for an address helper by using a \"jump\" service:").getBytes("UTF-8"));
-                    out.write("<br>\n".getBytes());
-
+                    boolean first = true;
                     if(uri.startsWith("http://")) {
                         uri = uri.substring(7);
                     }
@@ -1212,6 +1210,12 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                             }
                         }
 
+                        if (first) {
+                            first = false;
+                            out.write("<br><br>".getBytes());
+                            out.write(_("Click a link below to look for an address helper by using a \"jump\" service:").getBytes("UTF-8"));
+                            out.write("<br>\n".getBytes());
+                        }
                         out.write("<br><a href=\"".getBytes());
                         out.write(jurl.getBytes());
                         out.write(uri.getBytes());
@@ -1408,8 +1412,9 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
     }
     }
      ****/
-    /** */
-    private static final String BUNDLE_NAME = "net.i2p.i2ptunnel.web.messages";
+
+    /** these strings go in the jar, not the war */
+    private static final String BUNDLE_NAME = "net.i2p.i2ptunnel.proxy.messages";
 
     /** lang in routerconsole.lang property, else current locale */
     protected static String _(String key) {

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java

@@ -3,9 +3,9 @@
  */
 package net.i2p.i2ptunnel;
 
-import java.io.ByteArrayOutputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.Reader;
 import java.io.UnsupportedEncodingException;
 import java.net.Socket;
 import java.util.ArrayList;
@@ -27,6 +27,7 @@ import net.i2p.util.EventDispatcher;
 import net.i2p.util.InternalSocket;
 import net.i2p.util.Log;
 import net.i2p.util.PasswordManager;
+import net.i2p.util.TranslateReader;
 
 /**
  * Common things for HTTPClient and ConnectClient
@@ -496,44 +497,35 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
      */
     protected static byte[] getErrorPage(I2PAppContext ctx, String base, byte[] backup) {
         File errorDir = new File(ctx.getBaseDir(), "docs");
-        String lang = ctx.getProperty("routerconsole.lang", Locale.getDefault().getLanguage());
-        if(lang != null && lang.length() > 0 && !lang.equals("en")) {
-            File file = new File(errorDir, base + "-header_" + lang + ".ht");
-            try {
-                return readFile(file);
-            } catch(IOException ioe) {
-                // try the english version now
-            }
-        }
         File file = new File(errorDir, base + "-header.ht");
         try {
-            return readFile(file);
+            return readFile(ctx, file);
         } catch(IOException ioe) {
             return backup;
         }
     }
 
+    private static final String BUNDLE_NAME = "net.i2p.i2ptunnel.proxy.messages";
+
     /**
      *  @since 0.9.4 moved from I2PTunnelHTTPClient
      */
-    private static byte[] readFile(File file) throws IOException {
-        FileInputStream fis = null;
-        byte[] buf = new byte[2048];
-        ByteArrayOutputStream baos = new ByteArrayOutputStream(2048);
+    private static byte[] readFile(I2PAppContext ctx, File file) throws IOException {
+        Reader reader = null;
+        char[] buf = new char[512];
+        StringBuilder out = new StringBuilder(2048);
         try {
-            int len = 0;
-            fis = new FileInputStream(file);
-            while((len = fis.read(buf)) > 0) {
-                baos.write(buf, 0, len);
+            int len;
+            reader = new TranslateReader(ctx, BUNDLE_NAME, new FileInputStream(file));
+            while((len = reader.read(buf)) > 0) {
+                out.append(buf, 0, len);
             }
-            return baos.toByteArray();
+            return out.toString().getBytes("UTF-8");
         } finally {
             try {
-                if(fis != null) {
-                    fis.close();
-                }
-            } catch(IOException foo) {
-            }
+                if(reader != null)
+                    reader.close();
+            } catch(IOException foo) {}
         }
         // we won't ever get here
     }

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java

@@ -21,7 +21,9 @@ import java.util.zip.GZIPOutputStream;
 
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.I2PAppContext;
+import net.i2p.data.ByteArray;
 import net.i2p.data.DataHelper;
+import net.i2p.util.ByteCache;
 import net.i2p.util.EventDispatcher;
 import net.i2p.util.I2PAppThread;
 import net.i2p.util.Log;
@@ -221,7 +223,7 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
         // shadows _log in super()
         private final Log _log;
 
-        private static final int BUF_SIZE = 16*1024;
+        private static final int BUF_SIZE = 8*1024;
 
         public CompressedRequestor(Socket webserver, I2PSocket browser, String headers, I2PAppContext ctx, Log log) {
             _webserver = webserver;
@@ -245,6 +247,9 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
                     _log.info("request headers: " + _headers);
                 serverout.write(_headers.getBytes());
                 browserin = _browser.getInputStream();
+                // TODO don't spin off a thread for this except for POSTs
+                // beware interference with Tahoe-LAFS, Shoutcast, etc.?
+                // if (browserin.available() == 0) ?
                 I2PAppThread sender = new I2PAppThread(new Sender(serverout, browserin, "server: browser to server", _log), Thread.currentThread().getName() + "hcs");
                 sender.start();
                 
@@ -300,6 +305,8 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
         private final String _name;
         // shadows _log in super()
         private final Log _log;
+        private static final int BUF_SIZE = 8*1024;
+        private static final ByteCache _cache = ByteCache.getInstance(16, BUF_SIZE);
 
         public Sender(OutputStream out, InputStream in, String name, Log log) {
             _out = out;
@@ -311,10 +318,11 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
         public void run() {
             if (_log.shouldLog(Log.INFO))
                 _log.info(_name + ": Begin sending");
+            ByteArray ba = _cache.acquire();
             try {
-                byte buf[] = new byte[16*1024];
+                byte buf[] = ba.getData();
                 int read = 0;
-                int total = 0;
+                long total = 0;
                 while ( (read = _in.read(buf)) != -1) {
                     if (_log.shouldLog(Log.INFO))
                         _log.info(_name + ": read " + read + " and sending through the stream");
@@ -328,6 +336,7 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
                 if (_log.shouldLog(Log.DEBUG))
                     _log.debug("Error sending", ioe);
             } finally {
+                _cache.release(ba);
                 if (_out != null) try { _out.close(); } catch (IOException ioe) {}
                 if (_in != null) try { _in.close(); } catch (IOException ioe) {}
             }

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java

@@ -39,7 +39,7 @@ public class I2PTunnelRunner extends I2PAppThread implements I2PSocket.SocketErr
     private final Socket s;
     private final I2PSocket i2ps;
     private final Object slock, finishLock = new Object();
-    boolean finished = false;
+    volatile boolean finished = false;
     private final byte[] initialI2PData;
     private final byte[] initialSocketData;
     /** when the last data was sent/received (or -1 if never) */

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java

@@ -25,6 +25,7 @@ import java.util.concurrent.ThreadFactory;
 
 import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
+import net.i2p.client.I2PSessionException;
 import net.i2p.client.streaming.I2PServerSocket;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PSocketManager;
@@ -37,17 +38,16 @@ import net.i2p.util.Log;
 public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
 
     protected final Log _log;
-    protected I2PSocketManager sockMgr;
+    protected final I2PSocketManager sockMgr;
     protected I2PServerSocket i2pss;
 
     private final Object lock = new Object();
     protected final Object slock = new Object();
 
-    protected InetAddress remoteHost;
-    protected int remotePort;
-    private boolean _usePool;
-
-    protected Logging l;
+    protected final InetAddress remoteHost;
+    protected final int remotePort;
+    private final boolean _usePool;
+    protected final Logging l;
 
     private static final long DEFAULT_READ_TIMEOUT = 5*60*1000;
     /** default timeout to 5 minutes - override if desired */
@@ -56,6 +56,7 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
     /** do we use threads? default true (ignored for standard servers, always false) */
     private static final String PROP_USE_POOL = "i2ptunnel.usePool";
     private static final boolean DEFAULT_USE_POOL = true;
+    /** apparently unused */
     protected static volatile long __serverId = 0;
     /** max number of threads  - this many slowlorisses will DOS this server, but too high could OOM the JVM */
     private static final String PROP_HANDLER_COUNT = "i2ptunnel.blockingHandlerCount";
@@ -65,8 +66,8 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
     /** how long to wait before dropping an idle thread */
     private static final long HANDLER_KEEPALIVE_MS = 30*1000;
 
-    protected I2PTunnelTask task = null;
-    protected boolean bidir = false;
+    protected I2PTunnelTask task;
+    protected boolean bidir;
     private ThreadPoolExecutor _executor;
 
     /** unused? port should always be specified */
@@ -74,8 +75,7 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
     protected int localPort = DEFAULT_LOCALPORT;
 
     /**
-     * Warning, blocks in constructor while connecting to router and building tunnels;
-     * TODO move that to startRunning()
+     *  Non-blocking
      *
      * @param privData Base64-encoded private key data,
      *                 format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile}
@@ -86,16 +86,19 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
         super("Server at " + host + ':' + port, notifyThis, tunnel);
         _log = tunnel.getContext().logManager().getLog(getClass());
         ByteArrayInputStream bais = new ByteArrayInputStream(Base64.decode(privData));
-        init(host, port, bais, privData, l);
+        this.l = l;
+        this.remoteHost = host;
+        this.remotePort = port;
+        _usePool = getUsePool();
+        sockMgr = createManager(bais);
     }
 
     /**
-     * Warning, blocks in constructor while connecting to router and building tunnels;
-     * TODO move that to startRunning()
+     *  Non-blocking
      *
      * @param privkey file containing the private key data,
      *                format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile}
-     * @param privkeyname the name of the privKey file, not clear why we need this too
+     * @param privkeyname the name of the privKey file, just for logging
      * @throws IllegalArgumentException if the I2CP configuration is b0rked so
      *                                  badly that we cant create a socketManager
      */
@@ -103,13 +106,18 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
                            EventDispatcher notifyThis, I2PTunnel tunnel) {
         super("Server at " + host + ':' + port, notifyThis, tunnel);
         _log = tunnel.getContext().logManager().getLog(getClass());
+        this.l = l;
+        this.remoteHost = host;
+        this.remotePort = port;
+        _usePool = getUsePool();
         FileInputStream fis = null;
         try {
             fis = new FileInputStream(privkey);
-            init(host, port, fis, privkeyname, l);
+            sockMgr = createManager(fis);
         } catch (IOException ioe) {
-            _log.error("Error starting server", ioe);
+            _log.error("Cannot read private key data for " + privkeyname, ioe);
             notifyEvent("openServerResult", "error");
+            throw new IllegalArgumentException("Error starting server", ioe);
         } finally {
             if (fis != null)
                 try { fis.close(); } catch (IOException ioe) {}
@@ -117,19 +125,22 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
     }
 
     /**
-     * Warning, blocks in constructor while connecting to router and building tunnels;
-     * TODO move that to startRunning()
+     *  Non-blocking
      *
      * @param privData stream containing the private key data,
      *                 format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile}
-     * @param privkeyname the name of the privKey file, not clear why we need this too
+     * @param privkeyname the name of the privKey file, just for logging
      * @throws IllegalArgumentException if the I2CP configuration is b0rked so
      *                                  badly that we cant create a socketManager
      */
     public I2PTunnelServer(InetAddress host, int port, InputStream privData, String privkeyname, Logging l,  EventDispatcher notifyThis, I2PTunnel tunnel) {
         super("Server at " + host + ':' + port, notifyThis, tunnel);
         _log = tunnel.getContext().logManager().getLog(getClass());
-        init(host, port, privData, privkeyname, l);
+        this.l = l;
+        this.remoteHost = host;
+        this.remotePort = port;
+        _usePool = getUsePool();
+        sockMgr = createManager(privData);
     }
 
     /**
@@ -145,27 +156,35 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
         this.remoteHost = host;
         this.remotePort = port;
         _log = tunnel.getContext().logManager().getLog(getClass());
+        _usePool = false;
         sockMgr = sktMgr;
         open = true;
     }
 
+    /** @since 0.9.8 */
+    private boolean getUsePool() {
+        // extending classes default to threaded, but for a standard server, we can't get slowlorissed
+        boolean rv = !getClass().equals(I2PTunnelServer.class);
+        if (rv) {
+            String usePool = getTunnel().getClientOptions().getProperty(PROP_USE_POOL);
+            if (usePool != null)
+                rv = Boolean.parseBoolean(usePool);
+            else
+                rv = DEFAULT_USE_POOL;
+        }
+        return rv;
+    }
+
     private static final int RETRY_DELAY = 20*1000;
     private static final int MAX_RETRIES = 4;
 
     /**
-     * Warning, blocks while connecting to router and building tunnels;
-     * TODO move that to startRunning()
      *
-     * @param privData stream containing the private key data,
-     *                 format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile}
-     * @param privkeyname the name of the privKey file, not clear why we need this too
      * @throws IllegalArgumentException if the I2CP configuration is b0rked so
      *                                  badly that we cant create a socketManager
+     * @since 0.9.8
      */
-    private void init(InetAddress host, int port, InputStream privData, String privkeyname, Logging l) {
-        this.l = l;
-        this.remoteHost = host;
-        this.remotePort = port;
+    private I2PSocketManager createManager(InputStream privData) {
         Properties props = new Properties();
         props.putAll(getTunnel().getClientOptions());
         int portNum = 7654;
@@ -176,54 +195,54 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
                 _log.error("Invalid port specified [" + getTunnel().port + "], reverting to " + portNum);
             }
         }
-
-        // copy the privData to a new BAIS, so we can always reset() it if we have to retry
-        ByteArrayInputStream privDataCopy;
         try {
-            privDataCopy = copyOfInputStream(privData);
-        } catch (IOException ioe) {
-            _log.log(Log.CRIT, "Cannot read private key data for " + privkeyname, ioe);
-            return;
+            I2PSocketManager rv = I2PSocketManagerFactory.createDisconnectedManager(privData, getTunnel().host,
+                                                                                    portNum, props);
+            rv.setName("Server");
+            getTunnel().addSession(rv.getSession());
+            return rv;
+        } catch (I2PSessionException ise) {
+            throw new IllegalArgumentException("Can't create socket manager", ise);
+        } finally {
+            try { privData.close(); } catch (IOException ioe) {}
         }
+    }
 
-        // extending classes default to threaded, but for a standard server, we can't get slowlorissed
-        _usePool = !getClass().equals(I2PTunnelServer.class);
-        if (_usePool) {
-            String usePool = getTunnel().getClientOptions().getProperty(PROP_USE_POOL);
-            if (usePool != null)
-                _usePool = Boolean.parseBoolean(usePool);
-            else
-                _usePool = DEFAULT_USE_POOL;
-        }
 
-        // Todo: Can't stop a tunnel from the UI while it's in this loop (no session yet)
+    /**
+     * Warning, blocks while connecting to router and building tunnels;
+     *
+     * @throws IllegalArgumentException if the I2CP configuration is b0rked so
+     *                                  badly that we cant create a socketManager
+     * @since 0.9.8
+     */
+    private void connectManager() {
         int retries = 0;
-        while (sockMgr == null) {
-            synchronized (slock) {
-                sockMgr = I2PSocketManagerFactory.createManager(privDataCopy, getTunnel().host, portNum,
-                                                                props);
-
-            }
-            if (sockMgr == null) {
+        while (sockMgr.getSession().isClosed()) {
+            try {
+                sockMgr.getSession().connect();
+            } catch (I2PSessionException ise) {
                 // try to make this error sensible as it will happen...
+                String portNum = getTunnel().port;
+                if (portNum == null)
+                    portNum = "7654";
                 String msg = "Unable to connect to the router at " + getTunnel().host + ':' + portNum +
-                             " and build tunnels for the server at " + host.getHostAddress() + ':' + port;
+                             " and build tunnels for the server at " + remoteHost.getHostAddress() + ':' + remotePort;
                 if (++retries < MAX_RETRIES) {
-                    this.l.log(msg + ", retrying in " + (RETRY_DELAY / 1000) + " seconds");
-                    _log.error(msg + ", retrying in " + (RETRY_DELAY / 1000) + " seconds");
+                    msg += ", retrying in " + (RETRY_DELAY / 1000) + " seconds";
+                    this.l.log(msg);
+                    _log.error(msg);
                 } else {
-                    this.l.log(msg + ", giving up");
-                    _log.log(Log.CRIT, msg + ", giving up");
-                    throw new IllegalArgumentException(msg);
+                    msg += ", giving up";
+                    this.l.log(msg);
+                    _log.log(Log.CRIT, msg, ise);
+                    throw new IllegalArgumentException(msg, ise);
                 }
                 try { Thread.sleep(RETRY_DELAY); } catch (InterruptedException ie) {}
-                privDataCopy.reset();
             }
         }
 
-        sockMgr.setName("Server");
-        getTunnel().addSession(sockMgr.getSession());
-        l.log("Tunnels ready for server at " + host.getHostAddress() + ':' + port);
+        l.log("Tunnels ready for server at " + remoteHost.getHostAddress() + ':' + remotePort);
         notifyEvent("openServerResult", "ok");
         open = true;
     }
@@ -249,10 +268,13 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
     
     /**
      * Start running the I2PTunnelServer.
+     * Warning, blocks while connecting to router and building tunnels;
      *
-     * TODO: Wait to connect to router until here.
+     * @throws IllegalArgumentException if the I2CP configuration is b0rked so
+     *                                  badly that we cant create a socketManager
      */
-    public void startRunning() {
+    public synchronized void startRunning() {
+        connectManager();
         // prevent JVM exit when running outside the router
         boolean isDaemon = getTunnel().getContext().isRouterContext();
         Thread t = new I2PAppThread(this, "Server " + remoteHost + ':' + remotePort, isDaemon);
@@ -405,7 +427,7 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
 
     /** just to set the name and set Daemon */
     private static class CustomThreadFactory implements ThreadFactory {
-        private String _name;
+        private final String _name;
 
         public CustomThreadFactory(String name) {
             _name = name;
@@ -425,7 +447,7 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
      * Run the blockingHandler.
      */
     private class Handler implements Runnable { 
-        private I2PSocket _i2ps;
+        private final I2PSocket _i2ps;
 
         public Handler(I2PSocket socket) {
             _i2ps = socket;

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/InternalSocketRunner.java

@@ -14,20 +14,23 @@ import net.i2p.util.Log;
  * @author zzz
  * @since 0.7.9
  */
-class InternalSocketRunner implements Runnable {
+class InternalSocketRunner extends I2PAppThread {
     private final I2PTunnelClientBase client;
     private final int port;
     private ServerSocket ss;
     private volatile boolean open;
 
-    /** starts the runner */
+    /**
+     * Does not start the runner, caller must call start()
+     */
     InternalSocketRunner(I2PTunnelClientBase client) {
+        super("Internal socket port " + client.getLocalPort());
+        setDaemon(true);
         this.client = client;
         this.port = client.getLocalPort();
-        Thread t = new I2PAppThread(this, "Internal socket port " + this.port, true);
-        t.start();
     }
     
+    @Override
     public final void run() {
         try {
             this.ss = new InternalServerSocket(this.port);

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java

@@ -233,7 +233,8 @@ public abstract class LocalHTTPServer {
         return buf.toString();
     }
 
-    private static final String BUNDLE_NAME = "net.i2p.i2ptunnel.web.messages";
+    /** these strings go in the jar, not the war */
+    private static final String BUNDLE_NAME = "net.i2p.i2ptunnel.proxy.messages";
 
     /** lang in routerconsole.lang property, else current locale */
     protected static String _(String key) {

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java

@@ -378,4 +378,42 @@ public class EditBean extends IndexBean {
         if (controller == null) return null;
         return controller.getClientOptionProps();
     }
+
+    private static final String PROP_ADVANCED = "routerconsole.advanced";
+    private static final int DFLT_QUANTITY = 2;
+    private static final int MAX_CLIENT_QUANTITY = 3;
+    private static final int MAX_SERVER_QUANTITY = 6;
+    private static final int MAX_ADVANCED_QUANTITY = 16;
+
+    /**
+     *  @since 0.9.7
+     */
+    public String getQuantityOptions(int tunnel) {
+        int tunnelQuantity = getTunnelQuantity(tunnel, DFLT_QUANTITY);
+        boolean advanced = _context.getBooleanProperty(PROP_ADVANCED);
+        int maxQuantity = advanced ? MAX_ADVANCED_QUANTITY :
+                                     (isClient(tunnel) ? MAX_CLIENT_QUANTITY : MAX_SERVER_QUANTITY);
+        if (tunnelQuantity > maxQuantity)
+            maxQuantity = tunnelQuantity;
+        StringBuilder buf = new StringBuilder(256);
+        for (int i = 1; i <= maxQuantity; i++) {
+             buf.append("<option value=\"").append(i).append('"');
+             if (i == tunnelQuantity)
+                 buf.append(" selected=\"selected\"");
+             buf.append('>');
+             buf.append(ngettext("{0} inbound, {0} outbound tunnel", "{0} inbound, {0} outbound tunnels", i));
+             if (i <= 3) {
+                 buf.append(" (");
+                 if (i == 1)
+                     buf.append(_("lower bandwidth and reliability"));
+                 else if (i == 2)
+                     buf.append(_("standard bandwidth and reliability"));
+                 else if (i == 3)
+                     buf.append(_("higher bandwidth and reliability"));
+                 buf.append(')');
+             }
+             buf.append("</option>\n");
+        }
+        return buf.toString();
+    }
 }

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java

@@ -1293,4 +1293,11 @@ public class IndexBean {
     protected String _(String key) {
         return Messages._(key, _context);
     }
+
+    /** translate (ngettext)
+     *  @since 0.9.7
+     */
+    protected String ngettext(String s, String p, int n) {
+        return Messages.ngettext(s, p, n, _context);
+    }
 }

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/Messages.java

@@ -39,4 +39,11 @@ public class Messages {
     public String _(String s, Object o) {
         return Translate.getString(s, o, _context, BUNDLE_NAME);
     }
+
+    /** translate (ngettext)
+     *  @since 0.9.7
+     */
+    public static String ngettext(String s, String p, int n, I2PAppContext ctx) {
+        return Translate.getString(n, s, p, ctx, BUNDLE_NAME);
+    }
 }

apps/i2ptunnel/jsp/editClient.jsp

@@ -216,7 +216,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                     <%=intl._("Length")%>(<span class="accessKey">t</span>):
                 </label>
                 <select id="tunnelDepth" name="tunnelDepth" title="Length of each Tunnel" class="selectbox">
-                    <% int tunnelDepth = editBean.getTunnelDepth(curTunnel, 2);
+                    <% int tunnelDepth = editBean.getTunnelDepth(curTunnel, 3);
                   %><option value="0"<%=(tunnelDepth == 0 ? " selected=\"selected\"" : "") %>><%=intl._("0 hop tunnel (low anonymity, low latency)")%></option>
                     <option value="1"<%=(tunnelDepth == 1 ? " selected=\"selected\"" : "") %>><%=intl._("1 hop tunnel (medium anonymity, medium latency)")%></option>
                     <option value="2"<%=(tunnelDepth == 2 ? " selected=\"selected\"" : "") %>><%=intl._("2 hop tunnel (high anonymity, high latency)")%></option>
@@ -247,14 +247,8 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                     <%=intl._("Count")%>(<span class="accessKey">C</span>):
                 </label>
                 <select id="tunnelQuantity" name="tunnelQuantity" title="Number of Tunnels in Group" class="selectbox">
-                    <% int tunnelQuantity = editBean.getTunnelQuantity(curTunnel, 2);
-                  %><option value="1"<%=(tunnelQuantity == 1 ? " selected=\"selected\"" : "") %>><%=intl._("1 inbound, 1 outbound tunnel  (low bandwidth usage, less reliability)")%></option>
-                    <option value="2"<%=(tunnelQuantity == 2 ? " selected=\"selected\"" : "") %>><%=intl._("2 inbound, 2 outbound tunnels (standard bandwidth usage, standard reliability)")%></option>
-                    <option value="3"<%=(tunnelQuantity == 3 ? " selected=\"selected\"" : "") %>><%=intl._("3 inbound, 3 outbound tunnels (higher bandwidth usage, higher reliability)")%></option>
-                <% if (tunnelQuantity > 3) {
-                %>    <option value="<%=tunnelQuantity%>" selected="selected"><%=tunnelQuantity%>&nbsp;<%=intl._("tunnels")%></option>
-                <% }
-              %></select>                
+                    <%=editBean.getQuantityOptions(curTunnel)%>
+                </select>                
             </div>
             <div id="backupField" class="rowItem">
                 <label for="tunnelBackupQuantity" accesskey="b">

apps/i2ptunnel/jsp/editServer.jsp

@@ -233,7 +233,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                     <%=intl._("Length")%>(<span class="accessKey">t</span>):
                 </label>
                 <select id="tunnelDepth" name="tunnelDepth" title="Length of each Tunnel" class="selectbox">
-                    <% int tunnelDepth = editBean.getTunnelDepth(curTunnel, 2);
+                    <% int tunnelDepth = editBean.getTunnelDepth(curTunnel, 3);
                   %><option value="0"<%=(tunnelDepth == 0 ? " selected=\"selected\"" : "") %>><%=intl._("0 hop tunnel (low anonymity, low latency)")%></option>
                     <option value="1"<%=(tunnelDepth == 1 ? " selected=\"selected\"" : "") %>><%=intl._("1 hop tunnel (medium anonymity, medium latency)")%></option>
                     <option value="2"<%=(tunnelDepth == 2 ? " selected=\"selected\"" : "") %>><%=intl._("2 hop tunnel (high anonymity, high latency)")%></option>
@@ -264,17 +264,8 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                     <%=intl._("Count")%>(<span class="accessKey">C</span>):
                 </label>
                 <select id="tunnelQuantity" name="tunnelQuantity" title="Number of Tunnels in Group" class="selectbox">
-                    <% int tunnelQuantity = editBean.getTunnelQuantity(curTunnel, 2);
-                  %><option value="1"<%=(tunnelQuantity == 1 ? " selected=\"selected\"" : "") %>><%=intl._("1 inbound, 1 outbound tunnel  (low bandwidth usage, less reliability)")%></option>
-                    <option value="2"<%=(tunnelQuantity == 2 ? " selected=\"selected\"" : "") %>><%=intl._("2 inbound, 2 outbound tunnels (standard bandwidth usage, standard reliability)")%></option>
-                    <option value="3"<%=(tunnelQuantity == 3 ? " selected=\"selected\"" : "") %>><%=intl._("3 inbound, 3 outbound tunnels (higher bandwidth usage, higher reliability)")%></option>
-                    <option value="4"<%=(tunnelQuantity == 4 ? " selected=\"selected\"" : "") %>><%=intl._("4 in, 4 out (high traffic server)")%></option>
-                    <option value="5"<%=(tunnelQuantity == 5 ? " selected=\"selected\"" : "") %>><%=intl._("5 in, 5 out (high traffic server)")%></option>
-                    <option value="6"<%=(tunnelQuantity == 6 ? " selected=\"selected\"" : "") %>><%=intl._("6 in, 6 out (high traffic server)")%></option>
-                <% if (tunnelQuantity > 6) {
-                %>    <option value="<%=tunnelQuantity%>" selected="selected"><%=tunnelQuantity%>&nbsp;<%=intl._("tunnels")%></option>
-                <% }
-              %></select>                
+                    <%=editBean.getQuantityOptions(curTunnel)%>
+                </select>                
             </div>
             <div id="backupField" class="rowItem">
                 <label for="tunnelBackupQuantity" accesskey="b">

apps/i2ptunnel/jsp/index.jsp

@@ -107,7 +107,7 @@
       %>
         <div class="nameField rowItem">
             <label><%=intl._("Name")%>:</label>
-            <span class="text"><a href="edit?tunnel=<%=curServer%>" title="Edit Server Tunnel Settings for <%=indexBean.getTunnelName(curServer)%>" target="_top"><%=indexBean.getTunnelName(curServer)%></a></span>
+            <span class="text"><a href="edit?tunnel=<%=curServer%>" title="Edit Server Tunnel Settings for <%=indexBean.getTunnelName(curServer)%>"><%=indexBean.getTunnelName(curServer)%></a></span>
         </div>
         <div class="previewField rowItem">
             <label><%=intl._("Points at")%>:</label>

apps/i2ptunnel/jsp/wizard.jsp

@@ -471,7 +471,7 @@
                 <%=intl._("The wizard will set reasonably sensible default values for these, but you can view and/or edit these by clicking on the tunnel's name in the main I2PTunnel page.")%>
             </p>
 
-            <input type="hidden" name="tunnelDepth" value="2" />
+            <input type="hidden" name="tunnelDepth" value="3" />
             <input type="hidden" name="tunnelVariance" value="0" />
             <input type="hidden" name="tunnelQuantity" value="2" />
             <input type="hidden" name="tunnelBackupQuantity" value="0" />

apps/i2ptunnel/locale-proxy/messages_ar.po

@@ -0,0 +1,442 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2ptunnel package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# foo <foo@bar>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P i2ptunnel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-07-13 18:48+0000\n"
+"PO-Revision-Date: 2011-03-03 17:02-0000\n"
+"Last-Translator: hamada <hamada@mail.i2p>\n"
+"Language-Team: duck <duck@mail.i2p>\n"
+"Language: ar\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ../java/build/Proxy.java:5
+msgid "Proxy Authorization Required"
+msgstr "اعدادات البروكسي الخارجي"
+
+#: ../java/build/Proxy.java:6
+msgid "I2P HTTP Proxy Authorization Required"
+msgstr "اعدادات البروكسي الخارجي"
+
+#: ../java/build/Proxy.java:7
+msgid "This proxy is configured to require a username and password for access."
+msgstr ""
+
+#: ../java/build/Proxy.java:8
+#, java-format
+msgid ""
+"Please enter your username and password, or check your {0}router "
+"configuration{1} or {2}I2PTunnel configuration{3}."
+msgstr ""
+
+#: ../java/build/Proxy.java:9
+#, java-format
+msgid ""
+"To disable authorization, remove the configuration {0}i2ptunnel.proxy."
+"auth=basic{1}, then stop and restart the HTTP Proxy tunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:10 ../java/build/Proxy.java:16
+msgid "Warning: No Outproxy Configured"
+msgstr ""
+
+#: ../java/build/Proxy.java:11 ../java/build/Proxy.java:20
+#: ../java/build/Proxy.java:32 ../java/build/Proxy.java:44
+#: ../java/build/Proxy.java:52 ../java/build/Proxy.java:61
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:83
+#: ../java/build/Proxy.java:93 ../java/build/Proxy.java:103
+#: ../java/build/Proxy.java:115
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:196
+msgid "Router Console"
+msgstr ""
+
+#: ../java/build/Proxy.java:12 ../java/build/Proxy.java:21
+#: ../java/build/Proxy.java:33 ../java/build/Proxy.java:45
+#: ../java/build/Proxy.java:53 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:75 ../java/build/Proxy.java:84
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:104
+#: ../java/build/Proxy.java:116
+msgid "I2P Router Console"
+msgstr ""
+
+#: ../java/build/Proxy.java:13 ../java/build/Proxy.java:22
+#: ../java/build/Proxy.java:34 ../java/build/Proxy.java:46
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:76 ../java/build/Proxy.java:85
+#: ../java/build/Proxy.java:95 ../java/build/Proxy.java:105
+#: ../java/build/Proxy.java:117
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Configuration"
+msgstr "تم حفظ تغيرات الاعدادات"
+
+#: ../java/build/Proxy.java:14 ../java/build/Proxy.java:23
+#: ../java/build/Proxy.java:35 ../java/build/Proxy.java:47
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:77 ../java/build/Proxy.java:86
+#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:106
+#: ../java/build/Proxy.java:118
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Help"
+msgstr ""
+
+#: ../java/build/Proxy.java:15 ../java/build/Proxy.java:24
+#: ../java/build/Proxy.java:36 ../java/build/Proxy.java:48
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:65
+#: ../java/build/Proxy.java:78 ../java/build/Proxy.java:87
+#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:107
+#: ../java/build/Proxy.java:119
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Addressbook"
+msgstr "أضف الى دفتر العناوين"
+
+#: ../java/build/Proxy.java:17
+msgid ""
+"Your request was for a site outside of I2P, but you have no HTTP outproxy "
+"configured."
+msgstr ""
+
+#: ../java/build/Proxy.java:18
+msgid "Please configure an outproxy in I2PTunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:19
+msgid "Information: New Host Name"
+msgstr ""
+
+#: ../java/build/Proxy.java:25
+msgid "Information: New Host Name with Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:26
+msgid ""
+"The address helper link you followed is for a new host name that is not in "
+"your address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:27
+msgid "You may save this host name to your local address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:28
+msgid ""
+"If you save it to your address book, you will not see this message again."
+msgstr ""
+
+#: ../java/build/Proxy.java:29
+msgid ""
+"If you do not save it, the host name will be forgotten after the next router "
+"restart."
+msgstr ""
+
+#: ../java/build/Proxy.java:30
+msgid ""
+"If you do not wish to visit this host, click the \"back\" button on your "
+"browser."
+msgstr ""
+
+#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:37
+msgid "Warning: Invalid Destination"
+msgstr "وجهة محلية"
+
+#: ../java/build/Proxy.java:38
+msgid ""
+"The eepsite destination specified was not valid, or was otherwise "
+"unreachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:39
+msgid ""
+"Perhaps you pasted in the wrong Base 64 string or the link you are following "
+"is bad."
+msgstr ""
+
+#: ../java/build/Proxy.java:40
+msgid "The I2P host could also be offline."
+msgstr ""
+
+#: ../java/build/Proxy.java:41 ../java/build/Proxy.java:123
+#, java-format
+msgid "You may want to {0}retry{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:42 ../java/build/Proxy.java:72
+#: ../java/build/Proxy.java:113 ../java/build/Proxy.java:124
+msgid "Could not find the following destination:"
+msgstr "اسم او اتجاه"
+
+#: ../java/build/Proxy.java:43 ../java/build/Proxy.java:49
+msgid "Warning: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:50
+msgid "You attempted to connect to a non-I2P website or location."
+msgstr ""
+
+#: ../java/build/Proxy.java:51 ../java/build/Proxy.java:57
+msgid "Warning: Invalid Request URI"
+msgstr ""
+
+#: ../java/build/Proxy.java:58
+msgid "The request URI is invalid, and probably contains illegal characters."
+msgstr ""
+
+#: ../java/build/Proxy.java:59
+msgid ""
+"If you clicked a link, check the end of the URI for any characters the "
+"browser has mistakenly added on."
+msgstr ""
+
+#: ../java/build/Proxy.java:60
+msgid "Warning: Eepsite Unknown"
+msgstr ""
+
+#: ../java/build/Proxy.java:66
+msgid "Warning: Eepsite Not Found in Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:67
+msgid "The eepsite was not found in your router's addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:68
+msgid "Check the link or find a Base 32 or Base 64 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:69
+#, java-format
+msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:70
+msgid ""
+"Otherwise, find a Base 32 or address helper link, or use a jump service link "
+"below."
+msgstr ""
+
+#: ../java/build/Proxy.java:71
+#, java-format
+msgid ""
+"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
+"subscriptions{3} to your addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:73
+msgid "Error: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:79
+msgid "Error: Local Access"
+msgstr ""
+
+#: ../java/build/Proxy.java:80
+msgid "Your browser is misconfigured."
+msgstr ""
+
+#: ../java/build/Proxy.java:81
+msgid ""
+"Do not use the proxy to access the router console, localhost, or local LAN "
+"destinations."
+msgstr ""
+
+#: ../java/build/Proxy.java:82 ../java/build/Proxy.java:88
+msgid "Warning: Non-HTTP Protocol"
+msgstr ""
+
+#: ../java/build/Proxy.java:89
+msgid "The request uses a bad protocol."
+msgstr ""
+
+#: ../java/build/Proxy.java:90
+#, java-format
+msgid "The I2P HTTP Proxy supports {0}http://{1} requests ONLY."
+msgstr ""
+
+#: ../java/build/Proxy.java:91
+#, java-format
+msgid ""
+"Other protocols such as {0}https://{1} and {0}ftp://{1} are not allowed."
+msgstr ""
+
+#: ../java/build/Proxy.java:92 ../java/build/Proxy.java:98
+msgid "Warning: Bad Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:99
+#, java-format
+msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
+msgstr ""
+
+#: ../java/build/Proxy.java:100
+msgid "It seems to be garbage data, or a mistyped Base 32 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:101
+msgid ""
+"Check your URL to try and fix the helper key to be a valid Base 32 hostname "
+"or Base 64 key."
+msgstr ""
+
+#: ../java/build/Proxy.java:102 ../java/build/Proxy.java:108
+msgid "Warning: Outproxy Not Found"
+msgstr "تحديث بروكسي الى"
+
+#: ../java/build/Proxy.java:109
+msgid "The HTTP Outproxy was not found."
+msgstr ""
+
+#: ../java/build/Proxy.java:110
+msgid ""
+"It is offline, there is network congestion, or your router is not yet well-"
+"integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:111
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr ""
+
+#: ../java/build/Proxy.java:112
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list {0}"
+"here{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:114 ../java/build/Proxy.java:120
+msgid "Warning: Eepsite Unreachable"
+msgstr ""
+
+#: ../java/build/Proxy.java:121
+msgid "The eepsite was not reachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:122
+msgid ""
+"The eepsite is offline, there is network congestion, or your router is not "
+"yet well-integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:126
+msgid "Warning: Destination Key Conflict"
+msgstr ""
+
+#: ../java/build/Proxy.java:127
+msgid ""
+"The addresshelper link you followed specifies a different destination key "
+"than a host entry in your host database."
+msgstr ""
+
+#: ../java/build/Proxy.java:128
+msgid ""
+"Someone could be trying to impersonate another eepsite, or people have given "
+"two eepsites identical names."
+msgstr ""
+
+#: ../java/build/Proxy.java:129
+msgid ""
+"You can resolve the conflict by considering which key you trust, and either "
+"discarding the addresshelper link, discarding the host entry from your host "
+"database, or naming one of them differently."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "This seems to be a bad destination:"
+msgstr "اسم او اتجاه"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "i2paddresshelper cannot help you with a destination like that!"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:639
+#, 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 ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1043
+msgid "Host"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1047
+msgid "Base 32"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1051
+msgid "Destination"
+msgstr "اتجاه"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1057
+#, java-format
+msgid "Continue to {0} without saving"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1062
+#, java-format
+msgid "Save {0} to router address book and continue to eepsite"
+msgstr ""
+
+#. only blockfile supports multiple books
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1065
+#, java-format
+msgid "Save {0} to master address book and continue to eepsite"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1066
+#, java-format
+msgid "Save {0} to private address book and continue to eepsite"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1180
+msgid "HTTP Outproxy"
+msgstr "بروكسي خارجي"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+msgid ""
+"Click a link below to look for an address helper by using a \"jump\" service:"
+msgstr ""
+
+#. Translators: parameter is a host name
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1221
+#, java-format
+msgid "{0} jump service"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:163
+#, java-format
+msgid "Added via address helper from {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:165
+msgid "Added via address helper"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:190
+#, java-format
+msgid "Redirecting to {0}"
+msgstr "تحديث من {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:202
+#, java-format
+msgid "Saved {0} to the {1} addressbook, redirecting now."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:203
+#, java-format
+msgid "Failed to save {0} to the {1} addressbook, redirecting now."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
+msgid "Click here if you are not redirected automatically."
+msgstr ""

apps/i2ptunnel/locale-proxy/messages_cs.po

@@ -0,0 +1,443 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2ptunnel package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+#
+# Translators:
+# Waseihou Watashi <waseihou@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P i2ptunnel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-07-13 18:48+0000\n"
+"PO-Revision-Date: 2012-02-17 11:26+0000\n"
+"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
+"Language-Team: Czech (http://www.transifex.net/projects/p/I2P/language/cs/)\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: ../java/build/Proxy.java:5
+msgid "Proxy Authorization Required"
+msgstr ""
+
+#: ../java/build/Proxy.java:6
+msgid "I2P HTTP Proxy Authorization Required"
+msgstr ""
+
+#: ../java/build/Proxy.java:7
+msgid "This proxy is configured to require a username and password for access."
+msgstr ""
+
+#: ../java/build/Proxy.java:8
+#, java-format
+msgid ""
+"Please enter your username and password, or check your {0}router "
+"configuration{1} or {2}I2PTunnel configuration{3}."
+msgstr ""
+
+#: ../java/build/Proxy.java:9
+#, java-format
+msgid ""
+"To disable authorization, remove the configuration {0}i2ptunnel.proxy."
+"auth=basic{1}, then stop and restart the HTTP Proxy tunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:10 ../java/build/Proxy.java:16
+msgid "Warning: No Outproxy Configured"
+msgstr ""
+
+#: ../java/build/Proxy.java:11 ../java/build/Proxy.java:20
+#: ../java/build/Proxy.java:32 ../java/build/Proxy.java:44
+#: ../java/build/Proxy.java:52 ../java/build/Proxy.java:61
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:83
+#: ../java/build/Proxy.java:93 ../java/build/Proxy.java:103
+#: ../java/build/Proxy.java:115
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:196
+msgid "Router Console"
+msgstr ""
+
+#: ../java/build/Proxy.java:12 ../java/build/Proxy.java:21
+#: ../java/build/Proxy.java:33 ../java/build/Proxy.java:45
+#: ../java/build/Proxy.java:53 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:75 ../java/build/Proxy.java:84
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:104
+#: ../java/build/Proxy.java:116
+msgid "I2P Router Console"
+msgstr ""
+
+#: ../java/build/Proxy.java:13 ../java/build/Proxy.java:22
+#: ../java/build/Proxy.java:34 ../java/build/Proxy.java:46
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:76 ../java/build/Proxy.java:85
+#: ../java/build/Proxy.java:95 ../java/build/Proxy.java:105
+#: ../java/build/Proxy.java:117
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Configuration"
+msgstr ""
+
+#: ../java/build/Proxy.java:14 ../java/build/Proxy.java:23
+#: ../java/build/Proxy.java:35 ../java/build/Proxy.java:47
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:77 ../java/build/Proxy.java:86
+#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:106
+#: ../java/build/Proxy.java:118
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Help"
+msgstr ""
+
+#: ../java/build/Proxy.java:15 ../java/build/Proxy.java:24
+#: ../java/build/Proxy.java:36 ../java/build/Proxy.java:48
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:65
+#: ../java/build/Proxy.java:78 ../java/build/Proxy.java:87
+#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:107
+#: ../java/build/Proxy.java:119
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:17
+msgid ""
+"Your request was for a site outside of I2P, but you have no HTTP outproxy "
+"configured."
+msgstr ""
+
+#: ../java/build/Proxy.java:18
+msgid "Please configure an outproxy in I2PTunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:19
+msgid "Information: New Host Name"
+msgstr ""
+
+#: ../java/build/Proxy.java:25
+msgid "Information: New Host Name with Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:26
+msgid ""
+"The address helper link you followed is for a new host name that is not in "
+"your address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:27
+msgid "You may save this host name to your local address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:28
+msgid ""
+"If you save it to your address book, you will not see this message again."
+msgstr ""
+
+#: ../java/build/Proxy.java:29
+msgid ""
+"If you do not save it, the host name will be forgotten after the next router "
+"restart."
+msgstr ""
+
+#: ../java/build/Proxy.java:30
+msgid ""
+"If you do not wish to visit this host, click the \"back\" button on your "
+"browser."
+msgstr ""
+
+#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:37
+msgid "Warning: Invalid Destination"
+msgstr "Cíl tunelu"
+
+#: ../java/build/Proxy.java:38
+msgid ""
+"The eepsite destination specified was not valid, or was otherwise "
+"unreachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:39
+msgid ""
+"Perhaps you pasted in the wrong Base 64 string or the link you are following "
+"is bad."
+msgstr ""
+
+#: ../java/build/Proxy.java:40
+msgid "The I2P host could also be offline."
+msgstr ""
+
+#: ../java/build/Proxy.java:41 ../java/build/Proxy.java:123
+#, java-format
+msgid "You may want to {0}retry{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:42 ../java/build/Proxy.java:72
+#: ../java/build/Proxy.java:113 ../java/build/Proxy.java:124
+msgid "Could not find the following destination:"
+msgstr "jméno nebo cíl"
+
+#: ../java/build/Proxy.java:43 ../java/build/Proxy.java:49
+msgid "Warning: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:50
+msgid "You attempted to connect to a non-I2P website or location."
+msgstr ""
+
+#: ../java/build/Proxy.java:51 ../java/build/Proxy.java:57
+msgid "Warning: Invalid Request URI"
+msgstr ""
+
+#: ../java/build/Proxy.java:58
+msgid "The request URI is invalid, and probably contains illegal characters."
+msgstr ""
+
+#: ../java/build/Proxy.java:59
+msgid ""
+"If you clicked a link, check the end of the URI for any characters the "
+"browser has mistakenly added on."
+msgstr ""
+
+#: ../java/build/Proxy.java:60
+msgid "Warning: Eepsite Unknown"
+msgstr ""
+
+#: ../java/build/Proxy.java:66
+msgid "Warning: Eepsite Not Found in Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:67
+msgid "The eepsite was not found in your router's addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:68
+msgid "Check the link or find a Base 32 or Base 64 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:69
+#, java-format
+msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:70
+msgid ""
+"Otherwise, find a Base 32 or address helper link, or use a jump service link "
+"below."
+msgstr ""
+
+#: ../java/build/Proxy.java:71
+#, java-format
+msgid ""
+"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
+"subscriptions{3} to your addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:73
+msgid "Error: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:79
+msgid "Error: Local Access"
+msgstr ""
+
+#: ../java/build/Proxy.java:80
+msgid "Your browser is misconfigured."
+msgstr ""
+
+#: ../java/build/Proxy.java:81
+msgid ""
+"Do not use the proxy to access the router console, localhost, or local LAN "
+"destinations."
+msgstr ""
+
+#: ../java/build/Proxy.java:82 ../java/build/Proxy.java:88
+msgid "Warning: Non-HTTP Protocol"
+msgstr ""
+
+#: ../java/build/Proxy.java:89
+msgid "The request uses a bad protocol."
+msgstr ""
+
+#: ../java/build/Proxy.java:90
+#, java-format
+msgid "The I2P HTTP Proxy supports {0}http://{1} requests ONLY."
+msgstr ""
+
+#: ../java/build/Proxy.java:91
+#, java-format
+msgid ""
+"Other protocols such as {0}https://{1} and {0}ftp://{1} are not allowed."
+msgstr ""
+
+#: ../java/build/Proxy.java:92 ../java/build/Proxy.java:98
+msgid "Warning: Bad Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:99
+#, java-format
+msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
+msgstr ""
+
+#: ../java/build/Proxy.java:100
+msgid "It seems to be garbage data, or a mistyped Base 32 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:101
+msgid ""
+"Check your URL to try and fix the helper key to be a valid Base 32 hostname "
+"or Base 64 key."
+msgstr ""
+
+#: ../java/build/Proxy.java:102 ../java/build/Proxy.java:108
+msgid "Warning: Outproxy Not Found"
+msgstr ""
+
+#: ../java/build/Proxy.java:109
+msgid "The HTTP Outproxy was not found."
+msgstr ""
+
+#: ../java/build/Proxy.java:110
+msgid ""
+"It is offline, there is network congestion, or your router is not yet well-"
+"integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:111
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr ""
+
+#: ../java/build/Proxy.java:112
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list {0}"
+"here{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:114 ../java/build/Proxy.java:120
+msgid "Warning: Eepsite Unreachable"
+msgstr ""
+
+#: ../java/build/Proxy.java:121
+msgid "The eepsite was not reachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:122
+msgid ""
+"The eepsite is offline, there is network congestion, or your router is not "
+"yet well-integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:126
+msgid "Warning: Destination Key Conflict"
+msgstr ""
+
+#: ../java/build/Proxy.java:127
+msgid ""
+"The addresshelper link you followed specifies a different destination key "
+"than a host entry in your host database."
+msgstr ""
+
+#: ../java/build/Proxy.java:128
+msgid ""
+"Someone could be trying to impersonate another eepsite, or people have given "
+"two eepsites identical names."
+msgstr ""
+
+#: ../java/build/Proxy.java:129
+msgid ""
+"You can resolve the conflict by considering which key you trust, and either "
+"discarding the addresshelper link, discarding the host entry from your host "
+"database, or naming one of them differently."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "This seems to be a bad destination:"
+msgstr "jméno nebo cíl"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "i2paddresshelper cannot help you with a destination like that!"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:639
+#, 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 ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1043
+msgid "Host"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1047
+msgid "Base 32"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1051
+msgid "Destination"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1057
+#, java-format
+msgid "Continue to {0} without saving"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1062
+#, java-format
+msgid "Save {0} to router address book and continue to eepsite"
+msgstr ""
+
+#. only blockfile supports multiple books
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1065
+#, java-format
+msgid "Save {0} to master address book and continue to eepsite"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1066
+#, java-format
+msgid "Save {0} to private address book and continue to eepsite"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1180
+msgid "HTTP Outproxy"
+msgstr "HTTP bidir"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+msgid ""
+"Click a link below to look for an address helper by using a \"jump\" service:"
+msgstr ""
+
+#. Translators: parameter is a host name
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1221
+#, java-format
+msgid "{0} jump service"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:163
+#, java-format
+msgid "Added via address helper from {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:165
+msgid "Added via address helper"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:190
+#, java-format
+msgid "Redirecting to {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:202
+#, java-format
+msgid "Saved {0} to the {1} addressbook, redirecting now."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:203
+#, java-format
+msgid "Failed to save {0} to the {1} addressbook, redirecting now."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
+msgid "Click here if you are not redirected automatically."
+msgstr ""

apps/i2ptunnel/locale-proxy/messages_de.po

@@ -0,0 +1,461 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2ptunnel package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+#
+# Translators:
+# blabla, 2011
+# D.A. Loader <>, 2012
+# driz <driz@i2pmail.org>, 2012
+# ducki2p <ducki2p@gmail.com>, 2011
+# foo <foo@bar>, 2009
+# mixxy, 2011
+# nextloop <ga25day@mytum.de>, 2013
+# pirr <pirr@tormail.org>, 2012
+# zeroflag <zeroflag@i2pmail.org>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-26 21:33+0000\n"
+"PO-Revision-Date: 2013-09-23 22:34+0000\n"
+"Last-Translator: nextloop <ga25day@mytum.de>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/I2P/language/"
+"de/)\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../java/build/Proxy.java:5 ../java/build/Proxy.java:11
+msgid "Warning: Outproxy Not Found"
+msgstr ""
+
+#: ../java/build/Proxy.java:6 ../java/build/Proxy.java:18
+#: ../java/build/Proxy.java:27 ../java/build/Proxy.java:40
+#: ../java/build/Proxy.java:49 ../java/build/Proxy.java:61
+#: ../java/build/Proxy.java:69 ../java/build/Proxy.java:88
+#: ../java/build/Proxy.java:99 ../java/build/Proxy.java:111
+#: ../java/build/Proxy.java:121
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:196
+msgid "Router Console"
+msgstr "Routerkonsole"
+
+#: ../java/build/Proxy.java:7 ../java/build/Proxy.java:19
+#: ../java/build/Proxy.java:28 ../java/build/Proxy.java:41
+#: ../java/build/Proxy.java:50 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:70 ../java/build/Proxy.java:89
+#: ../java/build/Proxy.java:100 ../java/build/Proxy.java:112
+#: ../java/build/Proxy.java:122
+msgid "I2P Router Console"
+msgstr "Routerkonsole"
+
+#: ../java/build/Proxy.java:8 ../java/build/Proxy.java:20
+#: ../java/build/Proxy.java:29 ../java/build/Proxy.java:42
+#: ../java/build/Proxy.java:51 ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:71 ../java/build/Proxy.java:90
+#: ../java/build/Proxy.java:101 ../java/build/Proxy.java:113
+#: ../java/build/Proxy.java:123
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Configuration"
+msgstr "Einstellungen"
+
+#: ../java/build/Proxy.java:9 ../java/build/Proxy.java:21
+#: ../java/build/Proxy.java:30 ../java/build/Proxy.java:43
+#: ../java/build/Proxy.java:52 ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:72 ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:102 ../java/build/Proxy.java:114
+#: ../java/build/Proxy.java:124
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Help"
+msgstr "Hilfe"
+
+#: ../java/build/Proxy.java:10 ../java/build/Proxy.java:22
+#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:44
+#: ../java/build/Proxy.java:53 ../java/build/Proxy.java:65
+#: ../java/build/Proxy.java:73 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:103 ../java/build/Proxy.java:115
+#: ../java/build/Proxy.java:125
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Addressbook"
+msgstr "Adressbuch"
+
+#: ../java/build/Proxy.java:12
+msgid "The HTTP Outproxy was not found."
+msgstr "Der HTTP-Proxy ist nicht bereit"
+
+#: ../java/build/Proxy.java:13
+msgid ""
+"It is offline, there is network congestion, or your router is not yet well-"
+"integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:14
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr ""
+
+#: ../java/build/Proxy.java:15
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list {0}"
+"here{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:16 ../java/build/Proxy.java:38
+#: ../java/build/Proxy.java:59 ../java/build/Proxy.java:97
+msgid "Could not find the following destination:"
+msgstr "Tunnel Ziel"
+
+#: ../java/build/Proxy.java:17
+msgid "Error: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:23
+msgid "Error: Local Access"
+msgstr ""
+
+#: ../java/build/Proxy.java:24
+msgid "Your browser is misconfigured."
+msgstr "Dein Browser unterstützt keine iFrames."
+
+#: ../java/build/Proxy.java:25
+msgid ""
+"Do not use the proxy to access the router console, localhost, or local LAN "
+"destinations."
+msgstr ""
+
+#: ../java/build/Proxy.java:26
+msgid "Warning: Eepsite Unknown"
+msgstr ""
+
+#: ../java/build/Proxy.java:32
+msgid "Warning: Eepsite Not Found in Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:33
+msgid "The eepsite was not found in your router's addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:34
+msgid "Check the link or find a Base 32 or Base 64 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:35
+#, java-format
+msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:36
+msgid ""
+"Otherwise, find a Base 32 or address helper link, or use a jump service link "
+"below."
+msgstr ""
+
+#: ../java/build/Proxy.java:37
+#, java-format
+msgid ""
+"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
+"subscriptions{3} to your addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:39 ../java/build/Proxy.java:45
+msgid "Warning: Invalid Request URI"
+msgstr ""
+
+#: ../java/build/Proxy.java:46
+msgid "The request URI is invalid, and probably contains illegal characters."
+msgstr ""
+
+#: ../java/build/Proxy.java:47
+msgid ""
+"If you clicked a link, check the end of the URI for any characters the "
+"browser has mistakenly added on."
+msgstr ""
+
+#: ../java/build/Proxy.java:48 ../java/build/Proxy.java:54
+msgid "Warning: Invalid Destination"
+msgstr "lokales Ziel"
+
+#: ../java/build/Proxy.java:55
+msgid ""
+"The eepsite destination specified was not valid, or was otherwise "
+"unreachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:56
+msgid ""
+"Perhaps you pasted in the wrong Base 64 string or the link you are following "
+"is bad."
+msgstr ""
+
+#: ../java/build/Proxy.java:57
+msgid "The I2P host could also be offline."
+msgstr ""
+
+#: ../java/build/Proxy.java:58 ../java/build/Proxy.java:96
+#, java-format
+msgid "You may want to {0}retry{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:60 ../java/build/Proxy.java:66
+msgid "Warning: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:67
+msgid "You attempted to connect to a non-I2P website or location."
+msgstr ""
+
+#: ../java/build/Proxy.java:68 ../java/build/Proxy.java:74
+msgid "Warning: No Outproxy Configured"
+msgstr ""
+
+#: ../java/build/Proxy.java:75
+msgid ""
+"Your request was for a site outside of I2P, but you have no HTTP outproxy "
+"configured."
+msgstr ""
+
+#: ../java/build/Proxy.java:76
+msgid "Please configure an outproxy in I2PTunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:77 ../java/build/Proxy.java:78
+msgid "Warning: Destination Key Conflict"
+msgstr ""
+
+#: ../java/build/Proxy.java:79
+msgid ""
+"The addresshelper link you followed specifies a different destination key "
+"than a host entry in your host database."
+msgstr ""
+
+#: ../java/build/Proxy.java:80
+msgid ""
+"Someone could be trying to impersonate another eepsite, or people have given "
+"two eepsites identical names."
+msgstr ""
+
+#: ../java/build/Proxy.java:81
+msgid ""
+"You can resolve the conflict by considering which key you trust, and either "
+"discarding the addresshelper link, discarding the host entry from your host "
+"database, or naming one of them differently."
+msgstr ""
+
+#: ../java/build/Proxy.java:82
+msgid "Proxy Authorization Required"
+msgstr "Outproxy Autorisation"
+
+#: ../java/build/Proxy.java:83
+msgid "I2P HTTP Proxy Authorization Required"
+msgstr "Outproxy Autorisation"
+
+#: ../java/build/Proxy.java:84
+msgid "This proxy is configured to require a username and password for access."
+msgstr "Dieser Proxy kann nur mit Benutzername und Passwort erreicht werde."
+
+#: ../java/build/Proxy.java:85
+#, java-format
+msgid ""
+"Please enter your username and password, or check your {0}router "
+"configuration{1} or {2}I2PTunnel configuration{3}."
+msgstr ""
+"Bitte Benutzername und Passwort eingeben, oder überprüfe die {0}Router-"
+"Einstellungen{1} oder die {2}I2P-Tunnel Einstellungen{3}"
+
+#: ../java/build/Proxy.java:86
+#, java-format
+msgid ""
+"To disable authorization, remove the configuration {0}i2ptunnel.proxy."
+"auth=basic{1}, then stop and restart the HTTP Proxy tunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:93
+msgid "Warning: Eepsite Unreachable"
+msgstr ""
+
+#: ../java/build/Proxy.java:94
+msgid "The eepsite was not reachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:95
+msgid ""
+"The eepsite is offline, there is network congestion, or your router is not "
+"yet well-integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:98
+msgid "Information: New Host Name"
+msgstr ""
+
+#: ../java/build/Proxy.java:104
+msgid "Information: New Host Name with Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:105
+msgid ""
+"The address helper link you followed is for a new host name that is not in "
+"your address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:106
+msgid "You may save this host name to your local address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:107
+msgid ""
+"If you save it to your address book, you will not see this message again."
+msgstr ""
+
+#: ../java/build/Proxy.java:108
+msgid ""
+"If you do not save it, the host name will be forgotten after the next router "
+"restart."
+msgstr ""
+
+#: ../java/build/Proxy.java:109
+msgid ""
+"If you do not wish to visit this host, click the \"back\" button on your "
+"browser."
+msgstr ""
+
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:116
+msgid "Warning: Bad Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:117
+#, java-format
+msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
+msgstr ""
+
+#: ../java/build/Proxy.java:118
+msgid "It seems to be garbage data, or a mistyped Base 32 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:119
+msgid ""
+"Check your URL to try and fix the helper key to be a valid Base 32 hostname "
+"or Base 64 key."
+msgstr ""
+
+#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:126
+msgid "Warning: Non-HTTP Protocol"
+msgstr ""
+
+#: ../java/build/Proxy.java:127
+msgid "The request uses a bad protocol."
+msgstr ""
+
+#: ../java/build/Proxy.java:128
+#, java-format
+msgid "The I2P HTTP Proxy supports {0}http://{1} requests ONLY."
+msgstr ""
+
+#: ../java/build/Proxy.java:129
+#, java-format
+msgid ""
+"Other protocols such as {0}https://{1} and {0}ftp://{1} are not allowed."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "This seems to be a bad destination:"
+msgstr "Dies scheint kein gültiges Ziel zu sein:"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "i2paddresshelper cannot help you with a destination like that!"
+msgstr "Der I2P-Adresshelfer kann dir bei solch einem Ziel nicht helfen."
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:639
+#, 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>, und um das Ziel aus der kollidierenden Adresshelfer-"
+"Anfrage zu besuchen, <a href=\"{1}\">hier</a>!"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1043
+msgid "Host"
+msgstr "Host"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1047
+msgid "Base 32"
+msgstr "Base 32"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1051
+msgid "Destination"
+msgstr "Ziel"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1057
+#, java-format
+msgid "Continue to {0} without saving"
+msgstr "Weiter zu {0}, ohne zu speichern"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1062
+#, java-format
+msgid "Save {0} to router address book and continue to eepsite"
+msgstr "{0} im Router-Adressbuch speichern und auf die Eepseite weiterleiten"
+
+#. only blockfile supports multiple books
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1065
+#, java-format
+msgid "Save {0} to master address book and continue to eepsite"
+msgstr "{0} im Master-Adressbuch speichern und auf die Eepseite weiterleiten"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1066
+#, java-format
+msgid "Save {0} to private address book and continue to eepsite"
+msgstr "{0} im privaten Adressbuch speichern und auf die Eepseite weiterleiten"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1180
+msgid "HTTP Outproxy"
+msgstr "HTTP-Outproxy"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1216
+msgid ""
+"Click a link below to look for an address helper by using a \"jump\" service:"
+msgstr ""
+"Durch Klicken auf einen der untenstehenden Links bekommen Sie einen "
+"Adresshelfer von einem \"Sprung\"-Service:"
+
+#. Translators: parameter is a host name
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1224
+#, java-format
+msgid "{0} jump service"
+msgstr "Weiterleitungsdienst {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:163
+#, java-format
+msgid "Added via address helper from {0}"
+msgstr "Hinzugefüg über den Adressenhelfer von {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:165
+msgid "Added via address helper"
+msgstr "Durch Adresshelfer hinzugefügt"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:190
+#, java-format
+msgid "Redirecting to {0}"
+msgstr "Weiterleitung zu {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:202
+#, java-format
+msgid "Saved {0} to the {1} addressbook, redirecting now."
+msgstr ""
+"{0} wurde ins {1} Adressbuch geschrieben.  Du wirst nun weitergeleitet."
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:203
+#, java-format
+msgid "Failed to save {0} to the {1} addressbook, redirecting now."
+msgstr ""
+"Konnte {0} nicht im {1} Adressbuch speichern. Du wirst nun weitergeleitet."
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
+msgid "Click here if you are not redirected automatically."
+msgstr "Klick hier, wenn du nicht automatisch weitergeleitet wirst!"

apps/i2ptunnel/locale-proxy/messages_en.po

@@ -0,0 +1,442 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2ptunnel package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# foo <foo@bar>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P i2ptunnel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-08-11 14:23+0000\n"
+"PO-Revision-Date: 2010-06-15 14:09+0100\n"
+"Last-Translator: duck <duck@mail.i2p>\n"
+"Language-Team: duck <duck@mail.i2p>\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ../java/build/Proxy.java:5 ../java/build/Proxy.java:11
+msgid "Warning: Outproxy Not Found"
+msgstr ""
+
+#: ../java/build/Proxy.java:6 ../java/build/Proxy.java:18
+#: ../java/build/Proxy.java:27 ../java/build/Proxy.java:40
+#: ../java/build/Proxy.java:49 ../java/build/Proxy.java:61
+#: ../java/build/Proxy.java:69 ../java/build/Proxy.java:88
+#: ../java/build/Proxy.java:99 ../java/build/Proxy.java:111
+#: ../java/build/Proxy.java:121
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:196
+msgid "Router Console"
+msgstr ""
+
+#: ../java/build/Proxy.java:7 ../java/build/Proxy.java:19
+#: ../java/build/Proxy.java:28 ../java/build/Proxy.java:41
+#: ../java/build/Proxy.java:50 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:70 ../java/build/Proxy.java:89
+#: ../java/build/Proxy.java:100 ../java/build/Proxy.java:112
+#: ../java/build/Proxy.java:122
+msgid "I2P Router Console"
+msgstr ""
+
+#: ../java/build/Proxy.java:8 ../java/build/Proxy.java:20
+#: ../java/build/Proxy.java:29 ../java/build/Proxy.java:42
+#: ../java/build/Proxy.java:51 ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:71 ../java/build/Proxy.java:90
+#: ../java/build/Proxy.java:101 ../java/build/Proxy.java:113
+#: ../java/build/Proxy.java:123
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Configuration"
+msgstr ""
+
+#: ../java/build/Proxy.java:9 ../java/build/Proxy.java:21
+#: ../java/build/Proxy.java:30 ../java/build/Proxy.java:43
+#: ../java/build/Proxy.java:52 ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:72 ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:102 ../java/build/Proxy.java:114
+#: ../java/build/Proxy.java:124
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Help"
+msgstr ""
+
+#: ../java/build/Proxy.java:10 ../java/build/Proxy.java:22
+#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:44
+#: ../java/build/Proxy.java:53 ../java/build/Proxy.java:65
+#: ../java/build/Proxy.java:73 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:103 ../java/build/Proxy.java:115
+#: ../java/build/Proxy.java:125
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:12
+msgid "The HTTP Outproxy was not found."
+msgstr ""
+
+#: ../java/build/Proxy.java:13
+msgid ""
+"It is offline, there is network congestion, or your router is not yet well-"
+"integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:14
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr ""
+
+#: ../java/build/Proxy.java:15
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list {0}"
+"here{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:16 ../java/build/Proxy.java:38
+#: ../java/build/Proxy.java:59 ../java/build/Proxy.java:97
+msgid "Could not find the following destination:"
+msgstr ""
+
+#: ../java/build/Proxy.java:17
+msgid "Error: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:23
+msgid "Error: Local Access"
+msgstr ""
+
+#: ../java/build/Proxy.java:24
+msgid "Your browser is misconfigured."
+msgstr ""
+
+#: ../java/build/Proxy.java:25
+msgid ""
+"Do not use the proxy to access the router console, localhost, or local LAN "
+"destinations."
+msgstr ""
+
+#: ../java/build/Proxy.java:26
+msgid "Warning: Eepsite Unknown"
+msgstr ""
+
+#: ../java/build/Proxy.java:32
+msgid "Warning: Eepsite Not Found in Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:33
+msgid "The eepsite was not found in your router's addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:34
+msgid "Check the link or find a Base 32 or Base 64 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:35
+#, java-format
+msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:36
+msgid ""
+"Otherwise, find a Base 32 or address helper link, or use a jump service link "
+"below."
+msgstr ""
+
+#: ../java/build/Proxy.java:37
+#, java-format
+msgid ""
+"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
+"subscriptions{3} to your addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:39 ../java/build/Proxy.java:45
+msgid "Warning: Invalid Request URI"
+msgstr ""
+
+#: ../java/build/Proxy.java:46
+msgid "The request URI is invalid, and probably contains illegal characters."
+msgstr ""
+
+#: ../java/build/Proxy.java:47
+msgid ""
+"If you clicked a link, check the end of the URI for any characters the "
+"browser has mistakenly added on."
+msgstr ""
+
+#: ../java/build/Proxy.java:48 ../java/build/Proxy.java:54
+msgid "Warning: Invalid Destination"
+msgstr ""
+
+#: ../java/build/Proxy.java:55
+msgid ""
+"The eepsite destination specified was not valid, or was otherwise "
+"unreachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:56
+msgid ""
+"Perhaps you pasted in the wrong Base 64 string or the link you are following "
+"is bad."
+msgstr ""
+
+#: ../java/build/Proxy.java:57
+msgid "The I2P host could also be offline."
+msgstr ""
+
+#: ../java/build/Proxy.java:58 ../java/build/Proxy.java:96
+#, java-format
+msgid "You may want to {0}retry{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:60 ../java/build/Proxy.java:66
+msgid "Warning: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:67
+msgid "You attempted to connect to a non-I2P website or location."
+msgstr ""
+
+#: ../java/build/Proxy.java:68 ../java/build/Proxy.java:74
+msgid "Warning: No Outproxy Configured"
+msgstr ""
+
+#: ../java/build/Proxy.java:75
+msgid ""
+"Your request was for a site outside of I2P, but you have no HTTP outproxy "
+"configured."
+msgstr ""
+
+#: ../java/build/Proxy.java:76
+msgid "Please configure an outproxy in I2PTunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:77 ../java/build/Proxy.java:78
+msgid "Warning: Destination Key Conflict"
+msgstr ""
+
+#: ../java/build/Proxy.java:79
+msgid ""
+"The addresshelper link you followed specifies a different destination key "
+"than a host entry in your host database."
+msgstr ""
+
+#: ../java/build/Proxy.java:80
+msgid ""
+"Someone could be trying to impersonate another eepsite, or people have given "
+"two eepsites identical names."
+msgstr ""
+
+#: ../java/build/Proxy.java:81
+msgid ""
+"You can resolve the conflict by considering which key you trust, and either "
+"discarding the addresshelper link, discarding the host entry from your host "
+"database, or naming one of them differently."
+msgstr ""
+
+#: ../java/build/Proxy.java:82
+msgid "Proxy Authorization Required"
+msgstr ""
+
+#: ../java/build/Proxy.java:83
+msgid "I2P HTTP Proxy Authorization Required"
+msgstr ""
+
+#: ../java/build/Proxy.java:84
+msgid "This proxy is configured to require a username and password for access."
+msgstr ""
+
+#: ../java/build/Proxy.java:85
+#, java-format
+msgid ""
+"Please enter your username and password, or check your {0}router "
+"configuration{1} or {2}I2PTunnel configuration{3}."
+msgstr ""
+
+#: ../java/build/Proxy.java:86
+#, java-format
+msgid ""
+"To disable authorization, remove the configuration {0}i2ptunnel.proxy."
+"auth=basic{1}, then stop and restart the HTTP Proxy tunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:93
+msgid "Warning: Eepsite Unreachable"
+msgstr ""
+
+#: ../java/build/Proxy.java:94
+msgid "The eepsite was not reachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:95
+msgid ""
+"The eepsite is offline, there is network congestion, or your router is not "
+"yet well-integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:98
+msgid "Information: New Host Name"
+msgstr ""
+
+#: ../java/build/Proxy.java:104
+msgid "Information: New Host Name with Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:105
+msgid ""
+"The address helper link you followed is for a new host name that is not in "
+"your address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:106
+msgid "You may save this host name to your local address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:107
+msgid ""
+"If you save it to your address book, you will not see this message again."
+msgstr ""
+
+#: ../java/build/Proxy.java:108
+msgid ""
+"If you do not save it, the host name will be forgotten after the next router "
+"restart."
+msgstr ""
+
+#: ../java/build/Proxy.java:109
+msgid ""
+"If you do not wish to visit this host, click the \"back\" button on your "
+"browser."
+msgstr ""
+
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:116
+msgid "Warning: Bad Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:117
+#, java-format
+msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
+msgstr ""
+
+#: ../java/build/Proxy.java:118
+msgid "It seems to be garbage data, or a mistyped Base 32 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:119
+msgid ""
+"Check your URL to try and fix the helper key to be a valid Base 32 hostname "
+"or Base 64 key."
+msgstr ""
+
+#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:126
+msgid "Warning: Non-HTTP Protocol"
+msgstr ""
+
+#: ../java/build/Proxy.java:127
+msgid "The request uses a bad protocol."
+msgstr ""
+
+#: ../java/build/Proxy.java:128
+#, java-format
+msgid "The I2P HTTP Proxy supports {0}http://{1} requests ONLY."
+msgstr ""
+
+#: ../java/build/Proxy.java:129
+#, java-format
+msgid ""
+"Other protocols such as {0}https://{1} and {0}ftp://{1} are not allowed."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "This seems to be a bad destination:"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "i2paddresshelper cannot help you with a destination like that!"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:639
+#, 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 ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1043
+msgid "Host"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1047
+msgid "Base 32"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1051
+msgid "Destination"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1057
+#, java-format
+msgid "Continue to {0} without saving"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1062
+#, java-format
+msgid "Save {0} to router address book and continue to eepsite"
+msgstr ""
+
+#. only blockfile supports multiple books
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1065
+#, java-format
+msgid "Save {0} to master address book and continue to eepsite"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1066
+#, java-format
+msgid "Save {0} to private address book and continue to eepsite"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1180
+msgid "HTTP Outproxy"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1216
+msgid ""
+"Click a link below to look for an address helper by using a \"jump\" service:"
+msgstr ""
+
+#. Translators: parameter is a host name
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1224
+#, java-format
+msgid "{0} jump service"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:163
+#, java-format
+msgid "Added via address helper from {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:165
+msgid "Added via address helper"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:190
+#, java-format
+msgid "Redirecting to {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:202
+#, java-format
+msgid "Saved {0} to the {1} addressbook, redirecting now."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:203
+#, java-format
+msgid "Failed to save {0} to the {1} addressbook, redirecting now."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
+msgid "Click here if you are not redirected automatically."
+msgstr ""

apps/i2ptunnel/locale-proxy/messages_es.po

@@ -0,0 +1,506 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2ptunnel package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+#
+# Translators:
+# "blabla", 2011
+# blabla <blabla@trash-mail.com>, 2011-2012
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2013
+# ducki2p <ducki2p@gmail.com>, 2011
+# foo <foo@bar>, 2009
+# punkibastardo <punkibastardo@gmail.com>, 2011-2012
+# trolly, 2013
+# trolly, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P i2ptunnel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-08-11 14:30+0000\n"
+"PO-Revision-Date: 2013-07-29 10:00+0000\n"
+"Last-Translator: trolly\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/I2P/language/"
+"es/)\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../java/build/Proxy.java:5 ../java/build/Proxy.java:11
+msgid "Warning: Outproxy Not Found"
+msgstr "Advertencia: Outproxy no encontrado"
+
+#: ../java/build/Proxy.java:6 ../java/build/Proxy.java:18
+#: ../java/build/Proxy.java:27 ../java/build/Proxy.java:40
+#: ../java/build/Proxy.java:49 ../java/build/Proxy.java:61
+#: ../java/build/Proxy.java:69 ../java/build/Proxy.java:88
+#: ../java/build/Proxy.java:99 ../java/build/Proxy.java:111
+#: ../java/build/Proxy.java:121
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:196
+msgid "Router Console"
+msgstr "Consola del Ruter"
+
+#: ../java/build/Proxy.java:7 ../java/build/Proxy.java:19
+#: ../java/build/Proxy.java:28 ../java/build/Proxy.java:41
+#: ../java/build/Proxy.java:50 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:70 ../java/build/Proxy.java:89
+#: ../java/build/Proxy.java:100 ../java/build/Proxy.java:112
+#: ../java/build/Proxy.java:122
+msgid "I2P Router Console"
+msgstr "Consola del Ruter I2P"
+
+#: ../java/build/Proxy.java:8 ../java/build/Proxy.java:20
+#: ../java/build/Proxy.java:29 ../java/build/Proxy.java:42
+#: ../java/build/Proxy.java:51 ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:71 ../java/build/Proxy.java:90
+#: ../java/build/Proxy.java:101 ../java/build/Proxy.java:113
+#: ../java/build/Proxy.java:123
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Configuration"
+msgstr "Ajustes"
+
+#: ../java/build/Proxy.java:9 ../java/build/Proxy.java:21
+#: ../java/build/Proxy.java:30 ../java/build/Proxy.java:43
+#: ../java/build/Proxy.java:52 ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:72 ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:102 ../java/build/Proxy.java:114
+#: ../java/build/Proxy.java:124
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Help"
+msgstr "Ayuda"
+
+#: ../java/build/Proxy.java:10 ../java/build/Proxy.java:22
+#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:44
+#: ../java/build/Proxy.java:53 ../java/build/Proxy.java:65
+#: ../java/build/Proxy.java:73 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:103 ../java/build/Proxy.java:115
+#: ../java/build/Proxy.java:125
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Addressbook"
+msgstr "Libreta de direcciones"
+
+#: ../java/build/Proxy.java:12
+msgid "The HTTP Outproxy was not found."
+msgstr "El proxy HTTP no está activo"
+
+#: ../java/build/Proxy.java:13
+msgid ""
+"It is offline, there is network congestion, or your router is not yet well-"
+"integrated with peers."
+msgstr ""
+"Está apagado, o hay congestión en la red, o su ruter aún no está bien "
+"integrado con los otros pares."
+
+#: ../java/build/Proxy.java:14
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr ""
+"Puede ser que desee {0}reintentarlo{1} ya uqe esto seleccionará "
+"aleatoriamente un outproxy del grupo que haya definido {2}aquí{3} (si tiene "
+"configurado más de uno)"
+
+#: ../java/build/Proxy.java:15
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list {0}"
+"here{1}."
+msgstr ""
+"Si aún sigue teniendo problemas puede ser que desee editar si lista de "
+"outproxies {0}aquí{1}."
+
+#: ../java/build/Proxy.java:16 ../java/build/Proxy.java:38
+#: ../java/build/Proxy.java:59 ../java/build/Proxy.java:97
+msgid "Could not find the following destination:"
+msgstr "No se pudo encontrar el siguiente destino:"
+
+#: ../java/build/Proxy.java:17
+msgid "Error: Request Denied"
+msgstr "Error: solicitud denegada"
+
+#: ../java/build/Proxy.java:23
+msgid "Error: Local Access"
+msgstr "Error: acceso local"
+
+#: ../java/build/Proxy.java:24
+msgid "Your browser is misconfigured."
+msgstr "Su navegador no soporta iFrames."
+
+#: ../java/build/Proxy.java:25
+msgid ""
+"Do not use the proxy to access the router console, localhost, or local LAN "
+"destinations."
+msgstr ""
+"No use el proxy para acceder a la consola del ruter, localhost o "
+"destinaciones en su LAN local."
+
+#: ../java/build/Proxy.java:26
+msgid "Warning: Eepsite Unknown"
+msgstr "Advertencia: Eepsite desconocida."
+
+#: ../java/build/Proxy.java:32
+msgid "Warning: Eepsite Not Found in Addressbook"
+msgstr "Advertencia: Eepsite no encontrada en la libreta de direcciones"
+
+#: ../java/build/Proxy.java:33
+msgid "The eepsite was not found in your router's addressbook."
+msgstr "LA eepsite no se encontró en su libreta de direcciones."
+
+#: ../java/build/Proxy.java:34
+msgid "Check the link or find a Base 32 or Base 64 address."
+msgstr "Compruebe el enlace o busque una dirección Base 32 o Base 64."
+
+#: ../java/build/Proxy.java:35
+#, java-format
+msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
+msgstr ""
+"Si tiene una dirección Base 64, {0}añádala a su libreta de direcciones{1}."
+
+#: ../java/build/Proxy.java:36
+msgid ""
+"Otherwise, find a Base 32 or address helper link, or use a jump service link "
+"below."
+msgstr ""
+"Si no, encuentre una dirección Base 32 o un enlace de ayuda, o use un "
+"servicio de salto de más abajo."
+
+#: ../java/build/Proxy.java:37
+#, java-format
+msgid ""
+"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
+"subscriptions{3} to your addressbook."
+msgstr ""
+"¿Entra a esta web a menudo? Vea {0}el FAQ{1} para obtener ayuda de como {2}"
+"añadir suscripciones{3} a su libreta de direcciones."
+
+#: ../java/build/Proxy.java:39 ../java/build/Proxy.java:45
+msgid "Warning: Invalid Request URI"
+msgstr "Advertencia: URI solicitado no válida"
+
+#: ../java/build/Proxy.java:46
+msgid "The request URI is invalid, and probably contains illegal characters."
+msgstr ""
+"La URI solicitada no es válida y probablemente tenga caracteres no válidos."
+
+#: ../java/build/Proxy.java:47
+msgid ""
+"If you clicked a link, check the end of the URI for any characters the "
+"browser has mistakenly added on."
+msgstr ""
+"Si ha pulsado en un enlace, compruebe el final de la URI por caracteres que "
+"haya podido añadir el navegador por error."
+
+#: ../java/build/Proxy.java:48 ../java/build/Proxy.java:54
+msgid "Warning: Invalid Destination"
+msgstr "Aviso: Destinación no válida."
+
+#: ../java/build/Proxy.java:55
+msgid ""
+"The eepsite destination specified was not valid, or was otherwise "
+"unreachable."
+msgstr ""
+"La destinación de eepsite especificada no es válida, o quizás no se ha "
+"podido acceder a ella."
+
+#: ../java/build/Proxy.java:56
+msgid ""
+"Perhaps you pasted in the wrong Base 64 string or the link you are following "
+"is bad."
+msgstr ""
+"Quizás pegó la destinación Base 64 equivocada o el enlace que ha pulsado "
+"estaba mal."
+
+#: ../java/build/Proxy.java:57
+msgid "The I2P host could also be offline."
+msgstr "También podría ser que ese servidor I2P esté apagado."
+
+#: ../java/build/Proxy.java:58 ../java/build/Proxy.java:96
+#, java-format
+msgid "You may want to {0}retry{1}."
+msgstr "Quizás quiera {0}reintentarlo{1}."
+
+#: ../java/build/Proxy.java:60 ../java/build/Proxy.java:66
+msgid "Warning: Request Denied"
+msgstr "Advertencia: solicitud denegada"
+
+#: ../java/build/Proxy.java:67
+msgid "You attempted to connect to a non-I2P website or location."
+msgstr "Ha intentado conectarse a una localización o una web no I2P."
+
+#: ../java/build/Proxy.java:68 ../java/build/Proxy.java:74
+msgid "Warning: No Outproxy Configured"
+msgstr "Advertencia: no se ha configurado ningún proxy de salida"
+
+#: ../java/build/Proxy.java:75
+msgid ""
+"Your request was for a site outside of I2P, but you have no HTTP outproxy "
+"configured."
+msgstr ""
+"Su petición es para una web fuera de I2P, pero no tiene configurado el proxy "
+"de salida HTTP."
+
+#: ../java/build/Proxy.java:76
+msgid "Please configure an outproxy in I2PTunnel."
+msgstr "Por favor, configure un proxy de salida en el I2PTunnel."
+
+#: ../java/build/Proxy.java:77 ../java/build/Proxy.java:78
+msgid "Warning: Destination Key Conflict"
+msgstr "Advertencia: Conflicto con la clave de destino"
+
+#: ../java/build/Proxy.java:79
+msgid ""
+"The addresshelper link you followed specifies a different destination key "
+"than a host entry in your host database."
+msgstr ""
+"El enlace de ayuda que ha pulsado tienen una clave de destino diferente a la "
+"que ya tiene en su base de datos de dominios."
+
+#: ../java/build/Proxy.java:80
+msgid ""
+"Someone could be trying to impersonate another eepsite, or people have given "
+"two eepsites identical names."
+msgstr ""
+"Alguien podría estar intentando hacerse pasar por otra eepsite, o la gente "
+"ha puesto nombres idénticos a varias eepsites."
+
+#: ../java/build/Proxy.java:81
+msgid ""
+"You can resolve the conflict by considering which key you trust, and either "
+"discarding the addresshelper link, discarding the host entry from your host "
+"database, or naming one of them differently."
+msgstr ""
+"Puede resolver este conflicto considerando de qué clave se fía, y según "
+"esto, eliminando el enlace con la dirección de ayuda, eliminando la entrada "
+"de su base de datos de direcciones, o renombrando alguna de ellas."
+
+#: ../java/build/Proxy.java:82
+msgid "Proxy Authorization Required"
+msgstr "Se necesita Autorización para el Proxy"
+
+#: ../java/build/Proxy.java:83
+msgid "I2P HTTP Proxy Authorization Required"
+msgstr "Se necesita Autorización para el proxy I2P HTTP"
+
+#: ../java/build/Proxy.java:84
+msgid "This proxy is configured to require a username and password for access."
+msgstr ""
+"Este proxy está configurado para requerir un usuario y contraseña para "
+"acceder."
+
+#: ../java/build/Proxy.java:85
+#, java-format
+msgid ""
+"Please enter your username and password, or check your {0}router "
+"configuration{1} or {2}I2PTunnel configuration{3}."
+msgstr ""
+"Por favor, escriba su usuario y contraseña, o compruebe su configuración{1} "
+"del {0}ruter o su configuración{3} de {2}I2PTunnel."
+
+#: ../java/build/Proxy.java:86
+#, java-format
+msgid ""
+"To disable authorization, remove the configuration {0}i2ptunnel.proxy."
+"auth=basic{1}, then stop and restart the HTTP Proxy tunnel."
+msgstr ""
+"Para desactivar la autorización, elimine la configuración {0}i2ptunnel.proxy."
+"auth=basic{1}, entonces apague y reinicie el túnel HTTP Proxy."
+
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:93
+msgid "Warning: Eepsite Unreachable"
+msgstr "Advertencia: Eepsite no accesible"
+
+#: ../java/build/Proxy.java:94
+msgid "The eepsite was not reachable."
+msgstr "No se ha podido acceder a la eepsite."
+
+#: ../java/build/Proxy.java:95
+msgid ""
+"The eepsite is offline, there is network congestion, or your router is not "
+"yet well-integrated with peers."
+msgstr ""
+"La eepsite está pagada, o hay congestión en la red, o su ruter no está aún "
+"bien integrado con los otros pares."
+
+#: ../java/build/Proxy.java:98
+msgid "Information: New Host Name"
+msgstr "Información: Nuevo nombre de host"
+
+#: ../java/build/Proxy.java:104
+msgid "Information: New Host Name with Address Helper"
+msgstr "Información: Nuevo nombre de host con Ayuda de Dirección"
+
+#: ../java/build/Proxy.java:105
+msgid ""
+"The address helper link you followed is for a new host name that is not in "
+"your address book."
+msgstr ""
+"El enlace de ayuda de direcciones que ha abierto es para un nuevo nombre de "
+"dominio que no estaba en su libreta de direcciones."
+
+#: ../java/build/Proxy.java:106
+msgid "You may save this host name to your local address book."
+msgstr "Quizás desee guardar este dominio en su libreta de direcciones local."
+
+#: ../java/build/Proxy.java:107
+msgid ""
+"If you save it to your address book, you will not see this message again."
+msgstr ""
+"Si lo guarda en su libreta de direcciones, no verá este mensaje de nuevo."
+
+#: ../java/build/Proxy.java:108
+msgid ""
+"If you do not save it, the host name will be forgotten after the next router "
+"restart."
+msgstr "Si no lo guarda, el dominio se olvidará después de reiniciar el ruter."
+
+#: ../java/build/Proxy.java:109
+msgid ""
+"If you do not wish to visit this host, click the \"back\" button on your "
+"browser."
+msgstr ""
+"Di no desea visitar este dominio, pulse en botón  \"volver\"  de su "
+"navegador."
+
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:116
+msgid "Warning: Bad Address Helper"
+msgstr "Advertencia: Dirección de ayuda errónea."
+
+#: ../java/build/Proxy.java:117
+#, java-format
+msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
+msgstr ""
+"La clave de ayuda en la URL ({0}i2paddresshelper={1}) no se puede resolver."
+
+#: ../java/build/Proxy.java:118
+msgid "It seems to be garbage data, or a mistyped Base 32 address."
+msgstr "Parecen ser datos basura, o una dirección Base 32 mal escrita."
+
+#: ../java/build/Proxy.java:119
+msgid ""
+"Check your URL to try and fix the helper key to be a valid Base 32 hostname "
+"or Base 64 key."
+msgstr ""
+"Compruebe la URL e intente arreglar la clave de ayuda para que sea un nombre "
+"de dominio Base 32 válido, o una clave Base 64."
+
+#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:126
+msgid "Warning: Non-HTTP Protocol"
+msgstr "Advertencia: Protocolo no HTTP"
+
+#: ../java/build/Proxy.java:127
+msgid "The request uses a bad protocol."
+msgstr "La petición usa un protocolo incorrecto."
+
+#: ../java/build/Proxy.java:128
+#, java-format
+msgid "The I2P HTTP Proxy supports {0}http://{1} requests ONLY."
+msgstr "El proxy HTTP de I2P SÓLO admite peticiones {0}http://{1}."
+
+#: ../java/build/Proxy.java:129
+#, java-format
+msgid ""
+"Other protocols such as {0}https://{1} and {0}ftp://{1} are not allowed."
+msgstr ""
+"Otros protocolos como {0}https://{1} y {0}ftp://{1} no están permitidos."
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "This seems to be a bad destination:"
+msgstr "Éste parece ser un destino falso:"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "i2paddresshelper cannot help you with a destination like that!"
+msgstr "El ayudante de direcciones no te puede ayudar con un destino así."
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:639
+#, 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 ""
+"Para visitar el destino en la base de datos de hosts, ¡pincha <a href="
+"\"{0}\">aquí</a>! Para visitar el destino del ayudante de direcciones en "
+"conflicto, ¡pincha <a href=\"{1}\">aquí</a>!"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1043
+msgid "Host"
+msgstr "Host"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1047
+msgid "Base 32"
+msgstr "Base 32"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1051
+msgid "Destination"
+msgstr "Destino"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1057
+#, java-format
+msgid "Continue to {0} without saving"
+msgstr "Acceder a {0} sin guardar"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1062
+#, java-format
+msgid "Save {0} to router address book and continue to eepsite"
+msgstr ""
+"Guardar {0} a la libreta de direcciones del router y acceder al sitio i2p."
+
+#. only blockfile supports multiple books
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1065
+#, java-format
+msgid "Save {0} to master address book and continue to eepsite"
+msgstr ""
+"Guardar {0} a la libreta de direcciones principal y acceder al sitio i2p."
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1066
+#, java-format
+msgid "Save {0} to private address book and continue to eepsite"
+msgstr ""
+"Guardar {0} a la libreta de direcciones privada y acceder al sitio i2p."
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1180
+msgid "HTTP Outproxy"
+msgstr "Puerta de salida HTTP"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1216
+msgid ""
+"Click a link below to look for an address helper by using a \"jump\" service:"
+msgstr ""
+"Pincha en un enlace de debajo para buscar un ayudante de direcciones "
+"mediante el uso de un servicio de \"salto\":"
+
+#. Translators: parameter is a host name
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1224
+#, java-format
+msgid "{0} jump service"
+msgstr "servicio saltador {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:163
+#, java-format
+msgid "Added via address helper from {0}"
+msgstr "Agregado por el ayudante de direcciones desde {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:165
+msgid "Added via address helper"
+msgstr "Agregado por el ayudante de direcciones."
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:190
+#, java-format
+msgid "Redirecting to {0}"
+msgstr "Redireccionando a {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:202
+#, java-format
+msgid "Saved {0} to the {1} addressbook, redirecting now."
+msgstr "{0} ha sido guardado en la libreta {1}, accediendo ahora."
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:203
+#, java-format
+msgid "Failed to save {0} to the {1} addressbook, redirecting now."
+msgstr "No se ha podido guardar {0} en la libreta {1}, accediendo ahora."
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
+msgid "Click here if you are not redirected automatically."
+msgstr "¡Haz click aquí si no estás siendo enviado automáticamente!"

apps/i2ptunnel/locale-proxy/messages_fr.po

@@ -0,0 +1,514 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2ptunnel package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+#
+# Translators:
+# Boxoa590, 2012-2013
+# ducki2p <ducki2p@gmail.com>, 2011
+# foo <foo@bar>, 2009
+# Boxoa590, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-20 10:24+0000\n"
+"PO-Revision-Date: 2013-08-18 18:06+0000\n"
+"Last-Translator: Boxoa590\n"
+"Language-Team: French (http://www.transifex.com/projects/p/I2P/language/"
+"fr/)\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../java/build/Proxy.java:5 ../java/build/Proxy.java:11
+msgid "Warning: Outproxy Not Found"
+msgstr "Avertissement : outproxy non trouvé"
+
+#: ../java/build/Proxy.java:6 ../java/build/Proxy.java:18
+#: ../java/build/Proxy.java:27 ../java/build/Proxy.java:40
+#: ../java/build/Proxy.java:49 ../java/build/Proxy.java:61
+#: ../java/build/Proxy.java:69 ../java/build/Proxy.java:88
+#: ../java/build/Proxy.java:99 ../java/build/Proxy.java:111
+#: ../java/build/Proxy.java:121
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:196
+msgid "Router Console"
+msgstr "Console du routeur"
+
+#: ../java/build/Proxy.java:7 ../java/build/Proxy.java:19
+#: ../java/build/Proxy.java:28 ../java/build/Proxy.java:41
+#: ../java/build/Proxy.java:50 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:70 ../java/build/Proxy.java:89
+#: ../java/build/Proxy.java:100 ../java/build/Proxy.java:112
+#: ../java/build/Proxy.java:122
+msgid "I2P Router Console"
+msgstr "Console du routeur"
+
+#: ../java/build/Proxy.java:8 ../java/build/Proxy.java:20
+#: ../java/build/Proxy.java:29 ../java/build/Proxy.java:42
+#: ../java/build/Proxy.java:51 ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:71 ../java/build/Proxy.java:90
+#: ../java/build/Proxy.java:101 ../java/build/Proxy.java:113
+#: ../java/build/Proxy.java:123
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Configuration"
+msgstr "Configuration"
+
+#: ../java/build/Proxy.java:9 ../java/build/Proxy.java:21
+#: ../java/build/Proxy.java:30 ../java/build/Proxy.java:43
+#: ../java/build/Proxy.java:52 ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:72 ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:102 ../java/build/Proxy.java:114
+#: ../java/build/Proxy.java:124
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Help"
+msgstr "Aide"
+
+#: ../java/build/Proxy.java:10 ../java/build/Proxy.java:22
+#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:44
+#: ../java/build/Proxy.java:53 ../java/build/Proxy.java:65
+#: ../java/build/Proxy.java:73 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:103 ../java/build/Proxy.java:115
+#: ../java/build/Proxy.java:125
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Addressbook"
+msgstr "Carnet d'adresses"
+
+#: ../java/build/Proxy.java:12
+msgid "The HTTP Outproxy was not found."
+msgstr "Le proxy HTTP n'est pas en place"
+
+#: ../java/build/Proxy.java:13
+msgid ""
+"It is offline, there is network congestion, or your router is not yet well-"
+"integrated with peers."
+msgstr ""
+"Il est hors ligne, ou il ya congestion du réseau, ou votre routeur n'est pas "
+"encore bien intégré avec les pairs."
+
+#: ../java/build/Proxy.java:14
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr ""
+"Vous pouvez vouloir {0}réessayer{1} car cela va re-sélectionner au hasard un "
+"outproxy du pool que vous avez défini {2}içi{3} (si vous en avez plus d'un "
+"de configuré)."
+
+#: ../java/build/Proxy.java:15
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list {0}"
+"here{1}."
+msgstr ""
+"Si vous continuez à avoir des dérangements vous pouvez vouloir modifier "
+"votre liste de outproxy {0}içi{1}."
+
+#: ../java/build/Proxy.java:16 ../java/build/Proxy.java:38
+#: ../java/build/Proxy.java:59 ../java/build/Proxy.java:97
+msgid "Could not find the following destination:"
+msgstr "Destination du tunnel"
+
+#: ../java/build/Proxy.java:17
+msgid "Error: Request Denied"
+msgstr "Erreur : demande refusée"
+
+#: ../java/build/Proxy.java:23
+msgid "Error: Local Access"
+msgstr "Erreur : accès local"
+
+#: ../java/build/Proxy.java:24
+msgid "Your browser is misconfigured."
+msgstr "Votre navigateur n'est pas compatible iFrames."
+
+#: ../java/build/Proxy.java:25
+msgid ""
+"Do not use the proxy to access the router console, localhost, or local LAN "
+"destinations."
+msgstr ""
+"Ne pas utiliser le proxy pour accéder à la console du routeur, ni au "
+"localhost, ni vers des destinations de votre LAN local."
+
+#: ../java/build/Proxy.java:26
+msgid "Warning: Eepsite Unknown"
+msgstr "Avertissement : Eepsite inconnu"
+
+#: ../java/build/Proxy.java:32
+msgid "Warning: Eepsite Not Found in Addressbook"
+msgstr "Avertissement : Eepsite pas trouvé dans le carnet d'adresses"
+
+#: ../java/build/Proxy.java:33
+msgid "The eepsite was not found in your router's addressbook."
+msgstr ""
+"Le eepsite n'a pas été trouvé dans le carnet d'adresses de votre routeur."
+
+#: ../java/build/Proxy.java:34
+msgid "Check the link or find a Base 32 or Base 64 address."
+msgstr "Cliquez le lien ou trouvez une adresse base 32 ou base 64."
+
+#: ../java/build/Proxy.java:35
+#, java-format
+msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
+msgstr ""
+"Si vous avez l''adresse Base 64, {0}ajoutez-là à votre carnet d''adresse{1}."
+
+#: ../java/build/Proxy.java:36
+msgid ""
+"Otherwise, find a Base 32 or address helper link, or use a jump service link "
+"below."
+msgstr ""
+"Sinon, trouver un lien d'assistant d'adresse ou un lien Base 32, ou utiliser "
+"ci-dessous un lien service de saut."
+
+#: ../java/build/Proxy.java:37
+#, java-format
+msgid ""
+"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
+"subscriptions{3} to your addressbook."
+msgstr ""
+"Voyez-vous cette page souvent ? Voyez {0}la FAQ{1} pour de l'aide afin d'{2}"
+"ajouter quelques abonnements{3} à votre carnet d'adresses."
+
+#: ../java/build/Proxy.java:39 ../java/build/Proxy.java:45
+msgid "Warning: Invalid Request URI"
+msgstr "Avertissement : demande invalide d'URI"
+
+#: ../java/build/Proxy.java:46
+msgid "The request URI is invalid, and probably contains illegal characters."
+msgstr ""
+"L'URI de la requête n'est pas valide, et contient probablement des "
+"caractères illégaux."
+
+#: ../java/build/Proxy.java:47
+msgid ""
+"If you clicked a link, check the end of the URI for any characters the "
+"browser has mistakenly added on."
+msgstr ""
+"Si vous avez cliqué sur un lien, vérifiez la fin de l'URI pour d'éventuels "
+"caractères que le navigateur aurait ajourté à tort."
+
+#: ../java/build/Proxy.java:48 ../java/build/Proxy.java:54
+msgid "Warning: Invalid Destination"
+msgstr "Avertissement : destination invalide"
+
+#: ../java/build/Proxy.java:55
+msgid ""
+"The eepsite destination specified was not valid, or was otherwise "
+"unreachable."
+msgstr ""
+"La destination vers l'eepsite spécifié n'était pas valide, ou autrement "
+"était inaccessible."
+
+#: ../java/build/Proxy.java:56
+msgid ""
+"Perhaps you pasted in the wrong Base 64 string or the link you are following "
+"is bad."
+msgstr ""
+"Peut-être que vous avez collé dans la mauvaise chaîne base 64, ou le lien "
+"que vous suivez est mauvais."
+
+#: ../java/build/Proxy.java:57
+msgid "The I2P host could also be offline."
+msgstr "L'hôte I2P pourrait également être déconnecté."
+
+#: ../java/build/Proxy.java:58 ../java/build/Proxy.java:96
+#, java-format
+msgid "You may want to {0}retry{1}."
+msgstr "Vous pouvez vouloir {0}réessayer{1}."
+
+#: ../java/build/Proxy.java:60 ../java/build/Proxy.java:66
+msgid "Warning: Request Denied"
+msgstr "Avertissement : demande refusée"
+
+#: ../java/build/Proxy.java:67
+msgid "You attempted to connect to a non-I2P website or location."
+msgstr "Vous avez tenté de vous connecter à un site ou emplacement non-I2P."
+
+#: ../java/build/Proxy.java:68 ../java/build/Proxy.java:74
+msgid "Warning: No Outproxy Configured"
+msgstr "Avertissement : pas de outproxy configuré"
+
+#: ../java/build/Proxy.java:75
+msgid ""
+"Your request was for a site outside of I2P, but you have no HTTP outproxy "
+"configured."
+msgstr ""
+"Votre demande était pour un site en dehors de I2P, mais vous n'avez aucun "
+"outproxy HTTP de configuré."
+
+#: ../java/build/Proxy.java:76
+msgid "Please configure an outproxy in I2PTunnel."
+msgstr "Veuillez configurer un outproxy dans I2PTunnel."
+
+#: ../java/build/Proxy.java:77 ../java/build/Proxy.java:78
+msgid "Warning: Destination Key Conflict"
+msgstr "Avertissement : conflit de clé de destination"
+
+#: ../java/build/Proxy.java:79
+msgid ""
+"The addresshelper link you followed specifies a different destination key "
+"than a host entry in your host database."
+msgstr ""
+"Le lien d'assistant d'adresse que vous avez suivi spécifie une clé de "
+"destination différente de l'entrée d'hôte contenue dans votre base de "
+"données hôte."
+
+#: ../java/build/Proxy.java:80
+msgid ""
+"Someone could be trying to impersonate another eepsite, or people have given "
+"two eepsites identical names."
+msgstr ""
+"Quelqu'un pourrait essayer de se faire passer pour un autre eepsite, ou des "
+"gens ont donné des noms identiques à deux eepsites."
+
+#: ../java/build/Proxy.java:81
+msgid ""
+"You can resolve the conflict by considering which key you trust, and either "
+"discarding the addresshelper link, discarding the host entry from your host "
+"database, or naming one of them differently."
+msgstr ""
+"Vous pouvez résoudre le conflit en considérant à quelle clé vous faites "
+"confiance, et soit rejeter le lien de l'assistant d'adresse en rejetant "
+"l'entrée d'hôte hors de votre base de données hôte, ou nommer l'une d'elles "
+"différemment."
+
+#: ../java/build/Proxy.java:82
+msgid "Proxy Authorization Required"
+msgstr "Autorisation de proxy requise"
+
+#: ../java/build/Proxy.java:83
+msgid "I2P HTTP Proxy Authorization Required"
+msgstr "Autorisation de proxy HTTP I2P requise"
+
+#: ../java/build/Proxy.java:84
+msgid "This proxy is configured to require a username and password for access."
+msgstr ""
+"Ce proxy est configuré pour exiger un nom d'utilisateur et un mot de passe "
+"pour y accéder."
+
+#: ../java/build/Proxy.java:85
+#, java-format
+msgid ""
+"Please enter your username and password, or check your {0}router "
+"configuration{1} or {2}I2PTunnel configuration{3}."
+msgstr ""
+"Veuillez saisir votre nom d''utilisateur et mot de passe, ou vérifier votre "
+"{0}configuration de routeur{1} ou {2}configuration de I2PTunnel{3}."
+
+#: ../java/build/Proxy.java:86
+#, java-format
+msgid ""
+"To disable authorization, remove the configuration {0}i2ptunnel.proxy."
+"auth=basic{1}, then stop and restart the HTTP Proxy tunnel."
+msgstr ""
+"Pour désactiver l''autorisation, supprimer la configuration {0}i2ptunnel."
+"proxy.auth=basic{1}, puis arrêtez et redémarrez le tunnel du proxy HTTP."
+
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:93
+msgid "Warning: Eepsite Unreachable"
+msgstr "Avertissement : Eepsite inaccessible"
+
+#: ../java/build/Proxy.java:94
+msgid "The eepsite was not reachable."
+msgstr "Le eepsite n'était pas joignable."
+
+#: ../java/build/Proxy.java:95
+msgid ""
+"The eepsite is offline, there is network congestion, or your router is not "
+"yet well-integrated with peers."
+msgstr ""
+"Le eepsite est hors ligne, ou il y a congestion du réseau, ou votre routeur "
+"n'est pas encore bien intégré avec les pairs."
+
+#: ../java/build/Proxy.java:98
+msgid "Information: New Host Name"
+msgstr "Information : nouveau nom d'hôte"
+
+#: ../java/build/Proxy.java:104
+msgid "Information: New Host Name with Address Helper"
+msgstr "Information : nouveau nom d'hôte avec assistant d'adresse"
+
+#: ../java/build/Proxy.java:105
+msgid ""
+"The address helper link you followed is for a new host name that is not in "
+"your address book."
+msgstr ""
+"Le lien d'assistant d'adresse que vous avez suivi est pour un nouveau nom "
+"d'hôte qui n'est pas dans votre carnet d'adresses."
+
+#: ../java/build/Proxy.java:106
+msgid "You may save this host name to your local address book."
+msgstr ""
+"Il vous est possible d'enregistrer ce nom d'hôte à votre carnet d'adresses "
+"local."
+
+#: ../java/build/Proxy.java:107
+msgid ""
+"If you save it to your address book, you will not see this message again."
+msgstr ""
+"Si vous l'enregistrez dans votre carnet d'adresses, vous ne verrez plus ce "
+"message."
+
+#: ../java/build/Proxy.java:108
+msgid ""
+"If you do not save it, the host name will be forgotten after the next router "
+"restart."
+msgstr ""
+"Si vous n'enregistrez pas, le nom d'hôte sera oublié après le prochain "
+"redémarrage du routeur."
+
+#: ../java/build/Proxy.java:109
+msgid ""
+"If you do not wish to visit this host, click the \"back\" button on your "
+"browser."
+msgstr ""
+"Si vous ne souhaitez pas visiter cet hôte, cliquez sur le bouton \"précédent"
+"\" de votre navigateur."
+
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:116
+msgid "Warning: Bad Address Helper"
+msgstr "Avertissement : mauvais assistant d'adresse"
+
+#: ../java/build/Proxy.java:117
+#, java-format
+msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
+msgstr ""
+"La clé auxiliaire dans l''URL ({0}i2paddresshelper={1}) n''est pas résoluble."
+
+#: ../java/build/Proxy.java:118
+msgid "It seems to be garbage data, or a mistyped Base 32 address."
+msgstr ""
+"Il semble y avoir des données incorrectes, ou une faute de frappe dans "
+"l'adresse Base 32."
+
+#: ../java/build/Proxy.java:119
+msgid ""
+"Check your URL to try and fix the helper key to be a valid Base 32 hostname "
+"or Base 64 key."
+msgstr ""
+"Vérifiez votre URL afin d'essayer de résoudre la clé d'assistance pour "
+"qu'elle soit un nom d'hôte Base 32 valide ou clé Base 64."
+
+#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:126
+msgid "Warning: Non-HTTP Protocol"
+msgstr "Avertissement : protocole non HTTP"
+
+#: ../java/build/Proxy.java:127
+msgid "The request uses a bad protocol."
+msgstr "La requête utilise un mauvais protocole."
+
+#: ../java/build/Proxy.java:128
+#, java-format
+msgid "The I2P HTTP Proxy supports {0}http://{1} requests ONLY."
+msgstr ""
+"Le proxy HTTP I2P prend en charge les demandes {0}http://{1} uniquement."
+
+#: ../java/build/Proxy.java:129
+#, java-format
+msgid ""
+"Other protocols such as {0}https://{1} and {0}ftp://{1} are not allowed."
+msgstr ""
+"D''autres protocoles tels que {0}https://{1} et {0}ftp://{1} ne sont pas "
+"autorisés."
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "This seems to be a bad destination:"
+msgstr "Cela semble être une mauvaise destination"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "i2paddresshelper cannot help you with a destination like that!"
+msgstr ""
+"L'assistant d'adresse ne peut pas vous aider avec une destination comme "
+"cela !"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:639
+#, 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 ""
+"Pour aller à la destination de votre base de données d''hôtes, cliquez <a "
+"href=\"{0}\">içi</a>. Pour aller à la destination de l''assistant d''adresse "
+"en conflit, cliquez <a href=\"{1}\">içi</a>."
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1043
+msgid "Host"
+msgstr "Hôte"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1047
+msgid "Base 32"
+msgstr "Base 32"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1051
+msgid "Destination"
+msgstr "Destination"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1057
+#, java-format
+msgid "Continue to {0} without saving"
+msgstr "Aller sur le site i2p {0} sans enregistrer dans un carnet d'adresses. "
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1062
+#, java-format
+msgid "Save {0} to router address book and continue to eepsite"
+msgstr "Ajouter au carnet d''adresse du routeur {0} et aller sur le site i2p"
+
+#. only blockfile supports multiple books
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1065
+#, java-format
+msgid "Save {0} to master address book and continue to eepsite"
+msgstr "Ajouter au carnet d''adresse principal {0} et aller sur le site i2p"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1066
+#, java-format
+msgid "Save {0} to private address book and continue to eepsite"
+msgstr "Ajouter au carnet d''adresse privé {0} et aller sur le site i2p"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1180
+msgid "HTTP Outproxy"
+msgstr "proxy sortant HTTP"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1216
+msgid ""
+"Click a link below to look for an address helper by using a \"jump\" service:"
+msgstr ""
+"Cliquez sur un des liens ci-dessous pour chercher une aide d'adresse en "
+"utilisant un \"service de saut\":"
+
+#. Translators: parameter is a host name
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1224
+#, java-format
+msgid "{0} jump service"
+msgstr "{0} jump service"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:163
+#, java-format
+msgid "Added via address helper from {0}"
+msgstr "Ajouté via assistant d''adresse depuis {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:165
+msgid "Added via address helper"
+msgstr "Ajouté via assitant d'adresse"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:190
+#, java-format
+msgid "Redirecting to {0}"
+msgstr "Redirection vers {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:202
+#, java-format
+msgid "Saved {0} to the {1} addressbook, redirecting now."
+msgstr "{0} ajouté au carnet d''adresses {1}. Redirection en cours."
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:203
+#, java-format
+msgid "Failed to save {0} to the {1} addressbook, redirecting now."
+msgstr "{0} non ajouté au carnet d''adresses {1}. Redirection en cours."
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
+msgid "Click here if you are not redirected automatically."
+msgstr "Cliquez ici si vous n'êtes pas redirigé automatiquement."

apps/i2ptunnel/locale-proxy/messages_hu.po

@@ -0,0 +1,448 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2ptunnel package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P i2ptunnel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-07-13 18:49+0000\n"
+"PO-Revision-Date: 2012-06-01 21:37+0000\n"
+"Last-Translator: AdminLMH <lehetmashogy@i2pmail.org>\n"
+"Language-Team: Hungarian (http://www.transifex.net/projects/p/I2P/language/"
+"hu/)\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ../java/build/Proxy.java:5
+msgid "Proxy Authorization Required"
+msgstr "Kimenő proxy Hitelesítés"
+
+#: ../java/build/Proxy.java:6
+msgid "I2P HTTP Proxy Authorization Required"
+msgstr "Kimenő proxy Hitelesítés"
+
+#: ../java/build/Proxy.java:7
+msgid "This proxy is configured to require a username and password for access."
+msgstr ""
+
+#: ../java/build/Proxy.java:8
+#, java-format
+msgid ""
+"Please enter your username and password, or check your {0}router "
+"configuration{1} or {2}I2PTunnel configuration{3}."
+msgstr ""
+
+#: ../java/build/Proxy.java:9
+#, java-format
+msgid ""
+"To disable authorization, remove the configuration {0}i2ptunnel.proxy."
+"auth=basic{1}, then stop and restart the HTTP Proxy tunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:10 ../java/build/Proxy.java:16
+msgid "Warning: No Outproxy Configured"
+msgstr ""
+
+#: ../java/build/Proxy.java:11 ../java/build/Proxy.java:20
+#: ../java/build/Proxy.java:32 ../java/build/Proxy.java:44
+#: ../java/build/Proxy.java:52 ../java/build/Proxy.java:61
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:83
+#: ../java/build/Proxy.java:93 ../java/build/Proxy.java:103
+#: ../java/build/Proxy.java:115
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:196
+msgid "Router Console"
+msgstr "Router Konzol"
+
+#: ../java/build/Proxy.java:12 ../java/build/Proxy.java:21
+#: ../java/build/Proxy.java:33 ../java/build/Proxy.java:45
+#: ../java/build/Proxy.java:53 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:75 ../java/build/Proxy.java:84
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:104
+#: ../java/build/Proxy.java:116
+msgid "I2P Router Console"
+msgstr "Router Konzol"
+
+#: ../java/build/Proxy.java:13 ../java/build/Proxy.java:22
+#: ../java/build/Proxy.java:34 ../java/build/Proxy.java:46
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:76 ../java/build/Proxy.java:85
+#: ../java/build/Proxy.java:95 ../java/build/Proxy.java:105
+#: ../java/build/Proxy.java:117
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Configuration"
+msgstr "Beállítások"
+
+#: ../java/build/Proxy.java:14 ../java/build/Proxy.java:23
+#: ../java/build/Proxy.java:35 ../java/build/Proxy.java:47
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:77 ../java/build/Proxy.java:86
+#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:106
+#: ../java/build/Proxy.java:118
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Help"
+msgstr "Segítség"
+
+#: ../java/build/Proxy.java:15 ../java/build/Proxy.java:24
+#: ../java/build/Proxy.java:36 ../java/build/Proxy.java:48
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:65
+#: ../java/build/Proxy.java:78 ../java/build/Proxy.java:87
+#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:107
+#: ../java/build/Proxy.java:119
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Addressbook"
+msgstr "Címjegyzék"
+
+#: ../java/build/Proxy.java:17
+msgid ""
+"Your request was for a site outside of I2P, but you have no HTTP outproxy "
+"configured."
+msgstr ""
+
+#: ../java/build/Proxy.java:18
+msgid "Please configure an outproxy in I2PTunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:19
+msgid "Information: New Host Name"
+msgstr ""
+
+#: ../java/build/Proxy.java:25
+msgid "Information: New Host Name with Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:26
+msgid ""
+"The address helper link you followed is for a new host name that is not in "
+"your address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:27
+msgid "You may save this host name to your local address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:28
+msgid ""
+"If you save it to your address book, you will not see this message again."
+msgstr ""
+
+#: ../java/build/Proxy.java:29
+msgid ""
+"If you do not save it, the host name will be forgotten after the next router "
+"restart."
+msgstr ""
+
+#: ../java/build/Proxy.java:30
+msgid ""
+"If you do not wish to visit this host, click the \"back\" button on your "
+"browser."
+msgstr ""
+
+#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:37
+msgid "Warning: Invalid Destination"
+msgstr "Helyi célállomást"
+
+#: ../java/build/Proxy.java:38
+msgid ""
+"The eepsite destination specified was not valid, or was otherwise "
+"unreachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:39
+msgid ""
+"Perhaps you pasted in the wrong Base 64 string or the link you are following "
+"is bad."
+msgstr ""
+
+#: ../java/build/Proxy.java:40
+msgid "The I2P host could also be offline."
+msgstr ""
+
+#: ../java/build/Proxy.java:41 ../java/build/Proxy.java:123
+#, java-format
+msgid "You may want to {0}retry{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:42 ../java/build/Proxy.java:72
+#: ../java/build/Proxy.java:113 ../java/build/Proxy.java:124
+msgid "Could not find the following destination:"
+msgstr "Alagút célállomása"
+
+#: ../java/build/Proxy.java:43 ../java/build/Proxy.java:49
+msgid "Warning: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:50
+msgid "You attempted to connect to a non-I2P website or location."
+msgstr ""
+
+#: ../java/build/Proxy.java:51 ../java/build/Proxy.java:57
+msgid "Warning: Invalid Request URI"
+msgstr ""
+
+#: ../java/build/Proxy.java:58
+msgid "The request URI is invalid, and probably contains illegal characters."
+msgstr ""
+
+#: ../java/build/Proxy.java:59
+msgid ""
+"If you clicked a link, check the end of the URI for any characters the "
+"browser has mistakenly added on."
+msgstr ""
+
+#: ../java/build/Proxy.java:60
+msgid "Warning: Eepsite Unknown"
+msgstr ""
+
+#: ../java/build/Proxy.java:66
+msgid "Warning: Eepsite Not Found in Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:67
+msgid "The eepsite was not found in your router's addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:68
+msgid "Check the link or find a Base 32 or Base 64 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:69
+#, java-format
+msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:70
+msgid ""
+"Otherwise, find a Base 32 or address helper link, or use a jump service link "
+"below."
+msgstr ""
+
+#: ../java/build/Proxy.java:71
+#, java-format
+msgid ""
+"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
+"subscriptions{3} to your addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:73
+msgid "Error: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:79
+msgid "Error: Local Access"
+msgstr ""
+
+#: ../java/build/Proxy.java:80
+msgid "Your browser is misconfigured."
+msgstr ""
+
+#: ../java/build/Proxy.java:81
+msgid ""
+"Do not use the proxy to access the router console, localhost, or local LAN "
+"destinations."
+msgstr ""
+
+#: ../java/build/Proxy.java:82 ../java/build/Proxy.java:88
+msgid "Warning: Non-HTTP Protocol"
+msgstr ""
+
+#: ../java/build/Proxy.java:89
+msgid "The request uses a bad protocol."
+msgstr ""
+
+#: ../java/build/Proxy.java:90
+#, java-format
+msgid "The I2P HTTP Proxy supports {0}http://{1} requests ONLY."
+msgstr ""
+
+#: ../java/build/Proxy.java:91
+#, java-format
+msgid ""
+"Other protocols such as {0}https://{1} and {0}ftp://{1} are not allowed."
+msgstr ""
+
+#: ../java/build/Proxy.java:92 ../java/build/Proxy.java:98
+msgid "Warning: Bad Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:99
+#, java-format
+msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
+msgstr ""
+
+#: ../java/build/Proxy.java:100
+msgid "It seems to be garbage data, or a mistyped Base 32 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:101
+msgid ""
+"Check your URL to try and fix the helper key to be a valid Base 32 hostname "
+"or Base 64 key."
+msgstr ""
+
+#: ../java/build/Proxy.java:102 ../java/build/Proxy.java:108
+msgid "Warning: Outproxy Not Found"
+msgstr ""
+
+#: ../java/build/Proxy.java:109
+msgid "The HTTP Outproxy was not found."
+msgstr "A HTTP proxy nincs bekapcsolva"
+
+#: ../java/build/Proxy.java:110
+msgid ""
+"It is offline, there is network congestion, or your router is not yet well-"
+"integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:111
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr ""
+
+#: ../java/build/Proxy.java:112
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list {0}"
+"here{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:114 ../java/build/Proxy.java:120
+msgid "Warning: Eepsite Unreachable"
+msgstr ""
+
+#: ../java/build/Proxy.java:121
+msgid "The eepsite was not reachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:122
+msgid ""
+"The eepsite is offline, there is network congestion, or your router is not "
+"yet well-integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:126
+msgid "Warning: Destination Key Conflict"
+msgstr ""
+
+#: ../java/build/Proxy.java:127
+msgid ""
+"The addresshelper link you followed specifies a different destination key "
+"than a host entry in your host database."
+msgstr ""
+
+#: ../java/build/Proxy.java:128
+msgid ""
+"Someone could be trying to impersonate another eepsite, or people have given "
+"two eepsites identical names."
+msgstr ""
+
+#: ../java/build/Proxy.java:129
+msgid ""
+"You can resolve the conflict by considering which key you trust, and either "
+"discarding the addresshelper link, discarding the host entry from your host "
+"database, or naming one of them differently."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "This seems to be a bad destination:"
+msgstr "Ez rossz célállomásnak tűnik:"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "i2paddresshelper cannot help you with a destination like that!"
+msgstr "i2pcímsegítő nem tud segíteni ilyen célállomással!"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:639
+#, 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 hoszt adatbázisodban lévő célállomás megtekintéséhez kattints <a href="
+"\"{0}\">ide</a>. Az ütközésben lévő címsegítő célállomás megtekintéséhez "
+"kattints <a href=\"{1}\">ide</a>."
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1043
+msgid "Host"
+msgstr "Hoszt"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1047
+msgid "Base 32"
+msgstr "Bázis 32"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1051
+msgid "Destination"
+msgstr "Célállomás"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1057
+#, java-format
+msgid "Continue to {0} without saving"
+msgstr "Mentés nélkül tovább ide: {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1062
+#, java-format
+msgid "Save {0} to router address book and continue to eepsite"
+msgstr "{0} mentése a router címjegyzékbe és tovább az eep oldalra"
+
+#. only blockfile supports multiple books
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1065
+#, java-format
+msgid "Save {0} to master address book and continue to eepsite"
+msgstr "{0} mentése a mester címjegyzékbe és tovább az eep oldalra"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1066
+#, java-format
+msgid "Save {0} to private address book and continue to eepsite"
+msgstr "{0} mentése a privát címjegyzékbe és tovább az eep oldalra"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1180
+msgid "HTTP Outproxy"
+msgstr "HTTP Kimenő proxy"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+msgid ""
+"Click a link below to look for an address helper by using a \"jump\" service:"
+msgstr ""
+"Kattints az alábbi linkre, hogy címsegítő után nézz, \"ugrás\" szolgáltatás "
+"segítségével:"
+
+#. Translators: parameter is a host name
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1221
+#, java-format
+msgid "{0} jump service"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:163
+#, java-format
+msgid "Added via address helper from {0}"
+msgstr "Címsegítőn keresztül hozzáadva {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:165
+msgid "Added via address helper"
+msgstr "Címsegítőn keresztül hozzáadva"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:190
+#, java-format
+msgid "Redirecting to {0}"
+msgstr "Átirányítás ide: {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:202
+#, java-format
+msgid "Saved {0} to the {1} addressbook, redirecting now."
+msgstr "{0} mentése {1} címjegyzékbe, átirányítás alatt."
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:203
+#, java-format
+msgid "Failed to save {0} to the {1} addressbook, redirecting now."
+msgstr "{0} mentése {1} címjegyzékbe sikertelen, átirányítás alatt."
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
+msgid "Click here if you are not redirected automatically."
+msgstr "Kattints ide, amennyiben nem történt meg az automatikus átirányítás."

apps/i2ptunnel/locale-proxy/messages_it.po

@@ -0,0 +1,454 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2ptunnel package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+#
+# Translators:
+#   <badcluster@i2pmail.org>, 2012.
+#   <bovas85@gmail.com>, 2012.
+#   <colomboi2p@ymail.com>, 2012.
+#   <jokjok@hotmail.it>, 2011.
+# Tony Goodyear <fswitch20@hotmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P i2ptunnel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-07-13 18:49+0000\n"
+"PO-Revision-Date: 2012-11-18 22:16+0000\n"
+"Last-Translator: Tony Goodyear <fswitch20@hotmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/I2P/language/"
+"it/)\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../java/build/Proxy.java:5
+msgid "Proxy Authorization Required"
+msgstr "Autorizzazione Outproxy"
+
+#: ../java/build/Proxy.java:6
+msgid "I2P HTTP Proxy Authorization Required"
+msgstr "Autorizzazione Outproxy"
+
+#: ../java/build/Proxy.java:7
+msgid "This proxy is configured to require a username and password for access."
+msgstr ""
+
+#: ../java/build/Proxy.java:8
+#, java-format
+msgid ""
+"Please enter your username and password, or check your {0}router "
+"configuration{1} or {2}I2PTunnel configuration{3}."
+msgstr ""
+
+#: ../java/build/Proxy.java:9
+#, java-format
+msgid ""
+"To disable authorization, remove the configuration {0}i2ptunnel.proxy."
+"auth=basic{1}, then stop and restart the HTTP Proxy tunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:10 ../java/build/Proxy.java:16
+msgid "Warning: No Outproxy Configured"
+msgstr ""
+
+#: ../java/build/Proxy.java:11 ../java/build/Proxy.java:20
+#: ../java/build/Proxy.java:32 ../java/build/Proxy.java:44
+#: ../java/build/Proxy.java:52 ../java/build/Proxy.java:61
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:83
+#: ../java/build/Proxy.java:93 ../java/build/Proxy.java:103
+#: ../java/build/Proxy.java:115
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:196
+msgid "Router Console"
+msgstr "Console del router"
+
+#: ../java/build/Proxy.java:12 ../java/build/Proxy.java:21
+#: ../java/build/Proxy.java:33 ../java/build/Proxy.java:45
+#: ../java/build/Proxy.java:53 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:75 ../java/build/Proxy.java:84
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:104
+#: ../java/build/Proxy.java:116
+msgid "I2P Router Console"
+msgstr "Console del router"
+
+#: ../java/build/Proxy.java:13 ../java/build/Proxy.java:22
+#: ../java/build/Proxy.java:34 ../java/build/Proxy.java:46
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:76 ../java/build/Proxy.java:85
+#: ../java/build/Proxy.java:95 ../java/build/Proxy.java:105
+#: ../java/build/Proxy.java:117
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Configuration"
+msgstr "Configurazione"
+
+#: ../java/build/Proxy.java:14 ../java/build/Proxy.java:23
+#: ../java/build/Proxy.java:35 ../java/build/Proxy.java:47
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:77 ../java/build/Proxy.java:86
+#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:106
+#: ../java/build/Proxy.java:118
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Help"
+msgstr "Aiuto"
+
+#: ../java/build/Proxy.java:15 ../java/build/Proxy.java:24
+#: ../java/build/Proxy.java:36 ../java/build/Proxy.java:48
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:65
+#: ../java/build/Proxy.java:78 ../java/build/Proxy.java:87
+#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:107
+#: ../java/build/Proxy.java:119
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Addressbook"
+msgstr "Rubrica"
+
+#: ../java/build/Proxy.java:17
+msgid ""
+"Your request was for a site outside of I2P, but you have no HTTP outproxy "
+"configured."
+msgstr ""
+
+#: ../java/build/Proxy.java:18
+msgid "Please configure an outproxy in I2PTunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:19
+msgid "Information: New Host Name"
+msgstr ""
+
+#: ../java/build/Proxy.java:25
+msgid "Information: New Host Name with Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:26
+msgid ""
+"The address helper link you followed is for a new host name that is not in "
+"your address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:27
+msgid "You may save this host name to your local address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:28
+msgid ""
+"If you save it to your address book, you will not see this message again."
+msgstr ""
+
+#: ../java/build/Proxy.java:29
+msgid ""
+"If you do not save it, the host name will be forgotten after the next router "
+"restart."
+msgstr ""
+
+#: ../java/build/Proxy.java:30
+msgid ""
+"If you do not wish to visit this host, click the \"back\" button on your "
+"browser."
+msgstr ""
+
+#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:37
+msgid "Warning: Invalid Destination"
+msgstr "Destinazione locale"
+
+#: ../java/build/Proxy.java:38
+msgid ""
+"The eepsite destination specified was not valid, or was otherwise "
+"unreachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:39
+msgid ""
+"Perhaps you pasted in the wrong Base 64 string or the link you are following "
+"is bad."
+msgstr ""
+
+#: ../java/build/Proxy.java:40
+msgid "The I2P host could also be offline."
+msgstr ""
+
+#: ../java/build/Proxy.java:41 ../java/build/Proxy.java:123
+#, java-format
+msgid "You may want to {0}retry{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:42 ../java/build/Proxy.java:72
+#: ../java/build/Proxy.java:113 ../java/build/Proxy.java:124
+msgid "Could not find the following destination:"
+msgstr "Destinazione tunnel"
+
+#: ../java/build/Proxy.java:43 ../java/build/Proxy.java:49
+msgid "Warning: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:50
+msgid "You attempted to connect to a non-I2P website or location."
+msgstr ""
+
+#: ../java/build/Proxy.java:51 ../java/build/Proxy.java:57
+msgid "Warning: Invalid Request URI"
+msgstr ""
+
+#: ../java/build/Proxy.java:58
+msgid "The request URI is invalid, and probably contains illegal characters."
+msgstr ""
+
+#: ../java/build/Proxy.java:59
+msgid ""
+"If you clicked a link, check the end of the URI for any characters the "
+"browser has mistakenly added on."
+msgstr ""
+
+#: ../java/build/Proxy.java:60
+msgid "Warning: Eepsite Unknown"
+msgstr ""
+
+#: ../java/build/Proxy.java:66
+msgid "Warning: Eepsite Not Found in Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:67
+msgid "The eepsite was not found in your router's addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:68
+msgid "Check the link or find a Base 32 or Base 64 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:69
+#, java-format
+msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:70
+msgid ""
+"Otherwise, find a Base 32 or address helper link, or use a jump service link "
+"below."
+msgstr ""
+
+#: ../java/build/Proxy.java:71
+#, java-format
+msgid ""
+"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
+"subscriptions{3} to your addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:73
+msgid "Error: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:79
+msgid "Error: Local Access"
+msgstr ""
+
+#: ../java/build/Proxy.java:80
+msgid "Your browser is misconfigured."
+msgstr "Il tuo browse non supporta gli iFrames."
+
+#: ../java/build/Proxy.java:81
+msgid ""
+"Do not use the proxy to access the router console, localhost, or local LAN "
+"destinations."
+msgstr ""
+
+#: ../java/build/Proxy.java:82 ../java/build/Proxy.java:88
+msgid "Warning: Non-HTTP Protocol"
+msgstr ""
+
+#: ../java/build/Proxy.java:89
+msgid "The request uses a bad protocol."
+msgstr ""
+
+#: ../java/build/Proxy.java:90
+#, java-format
+msgid "The I2P HTTP Proxy supports {0}http://{1} requests ONLY."
+msgstr ""
+
+#: ../java/build/Proxy.java:91
+#, java-format
+msgid ""
+"Other protocols such as {0}https://{1} and {0}ftp://{1} are not allowed."
+msgstr ""
+
+#: ../java/build/Proxy.java:92 ../java/build/Proxy.java:98
+msgid "Warning: Bad Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:99
+#, java-format
+msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
+msgstr ""
+
+#: ../java/build/Proxy.java:100
+msgid "It seems to be garbage data, or a mistyped Base 32 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:101
+msgid ""
+"Check your URL to try and fix the helper key to be a valid Base 32 hostname "
+"or Base 64 key."
+msgstr ""
+
+#: ../java/build/Proxy.java:102 ../java/build/Proxy.java:108
+msgid "Warning: Outproxy Not Found"
+msgstr ""
+
+#: ../java/build/Proxy.java:109
+msgid "The HTTP Outproxy was not found."
+msgstr "Il proxy HTTP non è avviato"
+
+#: ../java/build/Proxy.java:110
+msgid ""
+"It is offline, there is network congestion, or your router is not yet well-"
+"integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:111
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr ""
+
+#: ../java/build/Proxy.java:112
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list {0}"
+"here{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:114 ../java/build/Proxy.java:120
+msgid "Warning: Eepsite Unreachable"
+msgstr ""
+
+#: ../java/build/Proxy.java:121
+msgid "The eepsite was not reachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:122
+msgid ""
+"The eepsite is offline, there is network congestion, or your router is not "
+"yet well-integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:126
+msgid "Warning: Destination Key Conflict"
+msgstr ""
+
+#: ../java/build/Proxy.java:127
+msgid ""
+"The addresshelper link you followed specifies a different destination key "
+"than a host entry in your host database."
+msgstr ""
+
+#: ../java/build/Proxy.java:128
+msgid ""
+"Someone could be trying to impersonate another eepsite, or people have given "
+"two eepsites identical names."
+msgstr ""
+
+#: ../java/build/Proxy.java:129
+msgid ""
+"You can resolve the conflict by considering which key you trust, and either "
+"discarding the addresshelper link, discarding the host entry from your host "
+"database, or naming one of them differently."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "This seems to be a bad destination:"
+msgstr "Questa non sembra essere una buona destinazione:"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "i2paddresshelper cannot help you with a destination like that!"
+msgstr "i2paddresshelper non ti può aiutare con una destinazione del genere!"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:639
+#, 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 ""
+"Per visitare la destinazione nel tuo database host, cliccare <a href="
+"\"{0}\">qui</a>. \n"
+"Per visitare la destinazione addresshelper in conflitto, cliccare <a href="
+"\"{1}\">qui</a>."
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1043
+msgid "Host"
+msgstr "Host"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1047
+msgid "Base 32"
+msgstr "Base 32"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1051
+msgid "Destination"
+msgstr "Destinazione"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1057
+#, java-format
+msgid "Continue to {0} without saving"
+msgstr "Continua a {0} senza salvare"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1062
+#, java-format
+msgid "Save {0} to router address book and continue to eepsite"
+msgstr "Salva {0} nella rubrica del router e continua verso l'eepsite"
+
+#. only blockfile supports multiple books
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1065
+#, java-format
+msgid "Save {0} to master address book and continue to eepsite"
+msgstr "Salva {0} nella rubrica master e continua verso l'eepsite"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1066
+#, java-format
+msgid "Save {0} to private address book and continue to eepsite"
+msgstr "Salva {0} nella rubrica privata e continua verso l'eepsite"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1180
+msgid "HTTP Outproxy"
+msgstr "Ourproxy HTTP"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+msgid ""
+"Click a link below to look for an address helper by using a \"jump\" service:"
+msgstr ""
+"Cliccare un link quì sotto per cercare un address helper usando un servizio "
+"di \"salto\":"
+
+#. Translators: parameter is a host name
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1221
+#, java-format
+msgid "{0} jump service"
+msgstr "{0} salta al servizio"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:163
+#, java-format
+msgid "Added via address helper from {0}"
+msgstr "Aggiunto con address helper {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:165
+msgid "Added via address helper"
+msgstr "Aggiunto con address helper"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:190
+#, java-format
+msgid "Redirecting to {0}"
+msgstr "Redirezionamento a {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:202
+#, java-format
+msgid "Saved {0} to the {1} addressbook, redirecting now."
+msgstr "{0} salvato sulla rubrica {1}, in redirezionamento."
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:203
+#, java-format
+msgid "Failed to save {0} to the {1} addressbook, redirecting now."
+msgstr "Salvataggio di {0} sulla rubrica {1} fallito, in redirezionamento."
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
+msgid "Click here if you are not redirected automatically."
+msgstr "Clicca qui se non sei redirezionato automaticamente."

apps/i2ptunnel/locale-proxy/messages_nb.po

@@ -0,0 +1,449 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2ptunnel package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+#
+# Translators:
+# Mikal <mikalv@mikalv.net>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P i2ptunnel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-07-13 18:49+0000\n"
+"PO-Revision-Date: 2013-01-29 18:12+0000\n"
+"Last-Translator: mikalv <mikalv@mikalv.net>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/I2P/"
+"language/nb/)\n"
+"Language: nb\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../java/build/Proxy.java:5
+msgid "Proxy Authorization Required"
+msgstr "utproxy autorisasjon"
+
+#: ../java/build/Proxy.java:6
+msgid "I2P HTTP Proxy Authorization Required"
+msgstr "utproxy autorisasjon"
+
+#: ../java/build/Proxy.java:7
+msgid "This proxy is configured to require a username and password for access."
+msgstr ""
+
+#: ../java/build/Proxy.java:8
+#, java-format
+msgid ""
+"Please enter your username and password, or check your {0}router "
+"configuration{1} or {2}I2PTunnel configuration{3}."
+msgstr ""
+
+#: ../java/build/Proxy.java:9
+#, java-format
+msgid ""
+"To disable authorization, remove the configuration {0}i2ptunnel.proxy."
+"auth=basic{1}, then stop and restart the HTTP Proxy tunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:10 ../java/build/Proxy.java:16
+msgid "Warning: No Outproxy Configured"
+msgstr ""
+
+#: ../java/build/Proxy.java:11 ../java/build/Proxy.java:20
+#: ../java/build/Proxy.java:32 ../java/build/Proxy.java:44
+#: ../java/build/Proxy.java:52 ../java/build/Proxy.java:61
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:83
+#: ../java/build/Proxy.java:93 ../java/build/Proxy.java:103
+#: ../java/build/Proxy.java:115
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:196
+msgid "Router Console"
+msgstr "Ruter Konsoll"
+
+#: ../java/build/Proxy.java:12 ../java/build/Proxy.java:21
+#: ../java/build/Proxy.java:33 ../java/build/Proxy.java:45
+#: ../java/build/Proxy.java:53 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:75 ../java/build/Proxy.java:84
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:104
+#: ../java/build/Proxy.java:116
+msgid "I2P Router Console"
+msgstr "Ruter Konsoll"
+
+#: ../java/build/Proxy.java:13 ../java/build/Proxy.java:22
+#: ../java/build/Proxy.java:34 ../java/build/Proxy.java:46
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:76 ../java/build/Proxy.java:85
+#: ../java/build/Proxy.java:95 ../java/build/Proxy.java:105
+#: ../java/build/Proxy.java:117
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Configuration"
+msgstr "Konfigurasjon"
+
+#: ../java/build/Proxy.java:14 ../java/build/Proxy.java:23
+#: ../java/build/Proxy.java:35 ../java/build/Proxy.java:47
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:77 ../java/build/Proxy.java:86
+#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:106
+#: ../java/build/Proxy.java:118
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Help"
+msgstr "Hjelp"
+
+#: ../java/build/Proxy.java:15 ../java/build/Proxy.java:24
+#: ../java/build/Proxy.java:36 ../java/build/Proxy.java:48
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:65
+#: ../java/build/Proxy.java:78 ../java/build/Proxy.java:87
+#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:107
+#: ../java/build/Proxy.java:119
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Addressbook"
+msgstr "Adressebok"
+
+#: ../java/build/Proxy.java:17
+msgid ""
+"Your request was for a site outside of I2P, but you have no HTTP outproxy "
+"configured."
+msgstr ""
+
+#: ../java/build/Proxy.java:18
+msgid "Please configure an outproxy in I2PTunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:19
+msgid "Information: New Host Name"
+msgstr ""
+
+#: ../java/build/Proxy.java:25
+msgid "Information: New Host Name with Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:26
+msgid ""
+"The address helper link you followed is for a new host name that is not in "
+"your address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:27
+msgid "You may save this host name to your local address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:28
+msgid ""
+"If you save it to your address book, you will not see this message again."
+msgstr ""
+
+#: ../java/build/Proxy.java:29
+msgid ""
+"If you do not save it, the host name will be forgotten after the next router "
+"restart."
+msgstr ""
+
+#: ../java/build/Proxy.java:30
+msgid ""
+"If you do not wish to visit this host, click the \"back\" button on your "
+"browser."
+msgstr ""
+
+#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:37
+msgid "Warning: Invalid Destination"
+msgstr "Lokal destinasjon"
+
+#: ../java/build/Proxy.java:38
+msgid ""
+"The eepsite destination specified was not valid, or was otherwise "
+"unreachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:39
+msgid ""
+"Perhaps you pasted in the wrong Base 64 string or the link you are following "
+"is bad."
+msgstr ""
+
+#: ../java/build/Proxy.java:40
+msgid "The I2P host could also be offline."
+msgstr ""
+
+#: ../java/build/Proxy.java:41 ../java/build/Proxy.java:123
+#, java-format
+msgid "You may want to {0}retry{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:42 ../java/build/Proxy.java:72
+#: ../java/build/Proxy.java:113 ../java/build/Proxy.java:124
+msgid "Could not find the following destination:"
+msgstr "Tunnel destinasjon"
+
+#: ../java/build/Proxy.java:43 ../java/build/Proxy.java:49
+msgid "Warning: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:50
+msgid "You attempted to connect to a non-I2P website or location."
+msgstr ""
+
+#: ../java/build/Proxy.java:51 ../java/build/Proxy.java:57
+msgid "Warning: Invalid Request URI"
+msgstr ""
+
+#: ../java/build/Proxy.java:58
+msgid "The request URI is invalid, and probably contains illegal characters."
+msgstr ""
+
+#: ../java/build/Proxy.java:59
+msgid ""
+"If you clicked a link, check the end of the URI for any characters the "
+"browser has mistakenly added on."
+msgstr ""
+
+#: ../java/build/Proxy.java:60
+msgid "Warning: Eepsite Unknown"
+msgstr ""
+
+#: ../java/build/Proxy.java:66
+msgid "Warning: Eepsite Not Found in Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:67
+msgid "The eepsite was not found in your router's addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:68
+msgid "Check the link or find a Base 32 or Base 64 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:69
+#, java-format
+msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:70
+msgid ""
+"Otherwise, find a Base 32 or address helper link, or use a jump service link "
+"below."
+msgstr ""
+
+#: ../java/build/Proxy.java:71
+#, java-format
+msgid ""
+"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
+"subscriptions{3} to your addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:73
+msgid "Error: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:79
+msgid "Error: Local Access"
+msgstr ""
+
+#: ../java/build/Proxy.java:80
+msgid "Your browser is misconfigured."
+msgstr ""
+
+#: ../java/build/Proxy.java:81
+msgid ""
+"Do not use the proxy to access the router console, localhost, or local LAN "
+"destinations."
+msgstr ""
+
+#: ../java/build/Proxy.java:82 ../java/build/Proxy.java:88
+msgid "Warning: Non-HTTP Protocol"
+msgstr ""
+
+#: ../java/build/Proxy.java:89
+msgid "The request uses a bad protocol."
+msgstr ""
+
+#: ../java/build/Proxy.java:90
+#, java-format
+msgid "The I2P HTTP Proxy supports {0}http://{1} requests ONLY."
+msgstr ""
+
+#: ../java/build/Proxy.java:91
+#, java-format
+msgid ""
+"Other protocols such as {0}https://{1} and {0}ftp://{1} are not allowed."
+msgstr ""
+
+#: ../java/build/Proxy.java:92 ../java/build/Proxy.java:98
+msgid "Warning: Bad Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:99
+#, java-format
+msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
+msgstr ""
+
+#: ../java/build/Proxy.java:100
+msgid "It seems to be garbage data, or a mistyped Base 32 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:101
+msgid ""
+"Check your URL to try and fix the helper key to be a valid Base 32 hostname "
+"or Base 64 key."
+msgstr ""
+
+#: ../java/build/Proxy.java:102 ../java/build/Proxy.java:108
+msgid "Warning: Outproxy Not Found"
+msgstr ""
+
+#: ../java/build/Proxy.java:109
+msgid "The HTTP Outproxy was not found."
+msgstr ""
+
+#: ../java/build/Proxy.java:110
+msgid ""
+"It is offline, there is network congestion, or your router is not yet well-"
+"integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:111
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr ""
+
+#: ../java/build/Proxy.java:112
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list {0}"
+"here{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:114 ../java/build/Proxy.java:120
+msgid "Warning: Eepsite Unreachable"
+msgstr ""
+
+#: ../java/build/Proxy.java:121
+msgid "The eepsite was not reachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:122
+msgid ""
+"The eepsite is offline, there is network congestion, or your router is not "
+"yet well-integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:126
+msgid "Warning: Destination Key Conflict"
+msgstr ""
+
+#: ../java/build/Proxy.java:127
+msgid ""
+"The addresshelper link you followed specifies a different destination key "
+"than a host entry in your host database."
+msgstr ""
+
+#: ../java/build/Proxy.java:128
+msgid ""
+"Someone could be trying to impersonate another eepsite, or people have given "
+"two eepsites identical names."
+msgstr ""
+
+#: ../java/build/Proxy.java:129
+msgid ""
+"You can resolve the conflict by considering which key you trust, and either "
+"discarding the addresshelper link, discarding the host entry from your host "
+"database, or naming one of them differently."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "This seems to be a bad destination:"
+msgstr "Dette synes å være en dårlig destinasjon:"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "i2paddresshelper cannot help you with a destination like that!"
+msgstr "i2paddresshelper kan ikke hjelpe deg med en destinasjon som dette!"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:639
+#, 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 ""
+"For å besøke destinasjonen i din vert database, klikk <a href=\"{0}\">her</"
+"a>. For å å besøke motstridende adressehjelper destinasjon, klikk <a href="
+"\"{1}\">her</a>."
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1043
+msgid "Host"
+msgstr "Vert"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1047
+msgid "Base 32"
+msgstr "Base 32"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1051
+msgid "Destination"
+msgstr "Destinasjon"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1057
+#, java-format
+msgid "Continue to {0} without saving"
+msgstr "Fortsett til {0} uten å lagre"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1062
+#, java-format
+msgid "Save {0} to router address book and continue to eepsite"
+msgstr "Lagre {0} til ruter adressebok og fortsett til eepsite"
+
+#. only blockfile supports multiple books
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1065
+#, java-format
+msgid "Save {0} to master address book and continue to eepsite"
+msgstr "Save {0} til hoved adressebok og fortsett til eepsite"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1066
+#, java-format
+msgid "Save {0} to private address book and continue to eepsite"
+msgstr "Save {0} til privat adressebok og fortsett til eepsite"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1180
+msgid "HTTP Outproxy"
+msgstr "HTTP Ut-proxy"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+msgid ""
+"Click a link below to look for an address helper by using a \"jump\" service:"
+msgstr ""
+"Klikk på en link under for en adressehjelper ved å bruke en \"hoppe\" "
+"tjeneste:"
+
+#. Translators: parameter is a host name
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1221
+#, java-format
+msgid "{0} jump service"
+msgstr "{0} hopp tjeneste"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:163
+#, java-format
+msgid "Added via address helper from {0}"
+msgstr "Lagt til via addresse hjelper fra {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:165
+msgid "Added via address helper"
+msgstr "Lagt til via adresse helper"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:190
+#, java-format
+msgid "Redirecting to {0}"
+msgstr "Videresender til {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:202
+#, java-format
+msgid "Saved {0} to the {1} addressbook, redirecting now."
+msgstr "Lagret {0} til {1} adresseboken, videresender nå."
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:203
+#, java-format
+msgid "Failed to save {0} to the {1} addressbook, redirecting now."
+msgstr "Feilet med å lagre {0} til {1} adresseboken, videresender nå."
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
+msgid "Click here if you are not redirected automatically."
+msgstr "Klikk her hvis du ikke blir videresendt automatisk."

apps/i2ptunnel/locale-proxy/messages_nl.po

@@ -0,0 +1,447 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2ptunnel package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# foo <foo@bar>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P i2ptunnel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-07-13 18:49+0000\n"
+"PO-Revision-Date: 2011-02-20 12:14+0000\n"
+"Last-Translator: ducki2p <ducki2p@gmail.com>\n"
+"Language-Team: Dutch <>\n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ../java/build/Proxy.java:5
+msgid "Proxy Authorization Required"
+msgstr "Uitgaande Proxy Autorisatie"
+
+#: ../java/build/Proxy.java:6
+msgid "I2P HTTP Proxy Authorization Required"
+msgstr "Uitgaande Proxy Autorisatie"
+
+#: ../java/build/Proxy.java:7
+msgid "This proxy is configured to require a username and password for access."
+msgstr ""
+
+#: ../java/build/Proxy.java:8
+#, java-format
+msgid ""
+"Please enter your username and password, or check your {0}router "
+"configuration{1} or {2}I2PTunnel configuration{3}."
+msgstr ""
+
+#: ../java/build/Proxy.java:9
+#, java-format
+msgid ""
+"To disable authorization, remove the configuration {0}i2ptunnel.proxy."
+"auth=basic{1}, then stop and restart the HTTP Proxy tunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:10 ../java/build/Proxy.java:16
+msgid "Warning: No Outproxy Configured"
+msgstr ""
+
+#: ../java/build/Proxy.java:11 ../java/build/Proxy.java:20
+#: ../java/build/Proxy.java:32 ../java/build/Proxy.java:44
+#: ../java/build/Proxy.java:52 ../java/build/Proxy.java:61
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:83
+#: ../java/build/Proxy.java:93 ../java/build/Proxy.java:103
+#: ../java/build/Proxy.java:115
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:196
+msgid "Router Console"
+msgstr ""
+
+#: ../java/build/Proxy.java:12 ../java/build/Proxy.java:21
+#: ../java/build/Proxy.java:33 ../java/build/Proxy.java:45
+#: ../java/build/Proxy.java:53 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:75 ../java/build/Proxy.java:84
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:104
+#: ../java/build/Proxy.java:116
+msgid "I2P Router Console"
+msgstr ""
+
+#: ../java/build/Proxy.java:13 ../java/build/Proxy.java:22
+#: ../java/build/Proxy.java:34 ../java/build/Proxy.java:46
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:76 ../java/build/Proxy.java:85
+#: ../java/build/Proxy.java:95 ../java/build/Proxy.java:105
+#: ../java/build/Proxy.java:117
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Configuration"
+msgstr "Configuratie wijzigingen opgeslagen"
+
+#: ../java/build/Proxy.java:14 ../java/build/Proxy.java:23
+#: ../java/build/Proxy.java:35 ../java/build/Proxy.java:47
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:77 ../java/build/Proxy.java:86
+#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:106
+#: ../java/build/Proxy.java:118
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Help"
+msgstr ""
+
+#: ../java/build/Proxy.java:15 ../java/build/Proxy.java:24
+#: ../java/build/Proxy.java:36 ../java/build/Proxy.java:48
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:65
+#: ../java/build/Proxy.java:78 ../java/build/Proxy.java:87
+#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:107
+#: ../java/build/Proxy.java:119
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Addressbook"
+msgstr "Toevoegen aan lokaal adresboek"
+
+#: ../java/build/Proxy.java:17
+msgid ""
+"Your request was for a site outside of I2P, but you have no HTTP outproxy "
+"configured."
+msgstr ""
+
+#: ../java/build/Proxy.java:18
+msgid "Please configure an outproxy in I2PTunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:19
+msgid "Information: New Host Name"
+msgstr ""
+
+#: ../java/build/Proxy.java:25
+msgid "Information: New Host Name with Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:26
+msgid ""
+"The address helper link you followed is for a new host name that is not in "
+"your address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:27
+msgid "You may save this host name to your local address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:28
+msgid ""
+"If you save it to your address book, you will not see this message again."
+msgstr ""
+
+#: ../java/build/Proxy.java:29
+msgid ""
+"If you do not save it, the host name will be forgotten after the next router "
+"restart."
+msgstr ""
+
+#: ../java/build/Proxy.java:30
+msgid ""
+"If you do not wish to visit this host, click the \"back\" button on your "
+"browser."
+msgstr ""
+
+#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:37
+msgid "Warning: Invalid Destination"
+msgstr "Lokale destination"
+
+#: ../java/build/Proxy.java:38
+msgid ""
+"The eepsite destination specified was not valid, or was otherwise "
+"unreachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:39
+msgid ""
+"Perhaps you pasted in the wrong Base 64 string or the link you are following "
+"is bad."
+msgstr ""
+
+#: ../java/build/Proxy.java:40
+msgid "The I2P host could also be offline."
+msgstr ""
+
+#: ../java/build/Proxy.java:41 ../java/build/Proxy.java:123
+#, java-format
+msgid "You may want to {0}retry{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:42 ../java/build/Proxy.java:72
+#: ../java/build/Proxy.java:113 ../java/build/Proxy.java:124
+msgid "Could not find the following destination:"
+msgstr "Tunnel Destinations"
+
+#: ../java/build/Proxy.java:43 ../java/build/Proxy.java:49
+msgid "Warning: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:50
+msgid "You attempted to connect to a non-I2P website or location."
+msgstr ""
+
+#: ../java/build/Proxy.java:51 ../java/build/Proxy.java:57
+msgid "Warning: Invalid Request URI"
+msgstr ""
+
+#: ../java/build/Proxy.java:58
+msgid "The request URI is invalid, and probably contains illegal characters."
+msgstr ""
+
+#: ../java/build/Proxy.java:59
+msgid ""
+"If you clicked a link, check the end of the URI for any characters the "
+"browser has mistakenly added on."
+msgstr ""
+
+#: ../java/build/Proxy.java:60
+msgid "Warning: Eepsite Unknown"
+msgstr ""
+
+#: ../java/build/Proxy.java:66
+msgid "Warning: Eepsite Not Found in Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:67
+msgid "The eepsite was not found in your router's addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:68
+msgid "Check the link or find a Base 32 or Base 64 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:69
+#, java-format
+msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:70
+msgid ""
+"Otherwise, find a Base 32 or address helper link, or use a jump service link "
+"below."
+msgstr ""
+
+#: ../java/build/Proxy.java:71
+#, java-format
+msgid ""
+"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
+"subscriptions{3} to your addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:73
+msgid "Error: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:79
+msgid "Error: Local Access"
+msgstr ""
+
+#: ../java/build/Proxy.java:80
+msgid "Your browser is misconfigured."
+msgstr ""
+
+#: ../java/build/Proxy.java:81
+msgid ""
+"Do not use the proxy to access the router console, localhost, or local LAN "
+"destinations."
+msgstr ""
+
+#: ../java/build/Proxy.java:82 ../java/build/Proxy.java:88
+msgid "Warning: Non-HTTP Protocol"
+msgstr ""
+
+#: ../java/build/Proxy.java:89
+msgid "The request uses a bad protocol."
+msgstr ""
+
+#: ../java/build/Proxy.java:90
+#, java-format
+msgid "The I2P HTTP Proxy supports {0}http://{1} requests ONLY."
+msgstr ""
+
+#: ../java/build/Proxy.java:91
+#, java-format
+msgid ""
+"Other protocols such as {0}https://{1} and {0}ftp://{1} are not allowed."
+msgstr ""
+
+#: ../java/build/Proxy.java:92 ../java/build/Proxy.java:98
+msgid "Warning: Bad Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:99
+#, java-format
+msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
+msgstr ""
+
+#: ../java/build/Proxy.java:100
+msgid "It seems to be garbage data, or a mistyped Base 32 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:101
+msgid ""
+"Check your URL to try and fix the helper key to be a valid Base 32 hostname "
+"or Base 64 key."
+msgstr ""
+
+#: ../java/build/Proxy.java:102 ../java/build/Proxy.java:108
+msgid "Warning: Outproxy Not Found"
+msgstr ""
+
+#: ../java/build/Proxy.java:109
+msgid "The HTTP Outproxy was not found."
+msgstr "De HTTP proxy is niet ingeschakeld"
+
+#: ../java/build/Proxy.java:110
+msgid ""
+"It is offline, there is network congestion, or your router is not yet well-"
+"integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:111
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr ""
+
+#: ../java/build/Proxy.java:112
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list {0}"
+"here{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:114 ../java/build/Proxy.java:120
+msgid "Warning: Eepsite Unreachable"
+msgstr ""
+
+#: ../java/build/Proxy.java:121
+msgid "The eepsite was not reachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:122
+msgid ""
+"The eepsite is offline, there is network congestion, or your router is not "
+"yet well-integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:126
+msgid "Warning: Destination Key Conflict"
+msgstr ""
+
+#: ../java/build/Proxy.java:127
+msgid ""
+"The addresshelper link you followed specifies a different destination key "
+"than a host entry in your host database."
+msgstr ""
+
+#: ../java/build/Proxy.java:128
+msgid ""
+"Someone could be trying to impersonate another eepsite, or people have given "
+"two eepsites identical names."
+msgstr ""
+
+#: ../java/build/Proxy.java:129
+msgid ""
+"You can resolve the conflict by considering which key you trust, and either "
+"discarding the addresshelper link, discarding the host entry from your host "
+"database, or naming one of them differently."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "This seems to be a bad destination:"
+msgstr "Tunnel Destinations"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "i2paddresshelper cannot help you with a destination like that!"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:639
+#, 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 ""
+"Om de destination in je host database te bezoeken, klik <a href="
+"\"{0}\">hier</a>. Om de conflicterende adreshelper destination te bezoeken, "
+"klik <a href=\"{1}\">hier</a>."
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1043
+msgid "Host"
+msgstr "Host"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1047
+msgid "Base 32"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1051
+msgid "Destination"
+msgstr "Destination"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1057
+#, java-format
+msgid "Continue to {0} without saving"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1062
+#, java-format
+msgid "Save {0} to router address book and continue to eepsite"
+msgstr ""
+
+#. only blockfile supports multiple books
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1065
+#, java-format
+msgid "Save {0} to master address book and continue to eepsite"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1066
+#, java-format
+msgid "Save {0} to private address book and continue to eepsite"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1180
+msgid "HTTP Outproxy"
+msgstr "Uitgaande proxy"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+msgid ""
+"Click a link below to look for an address helper by using a \"jump\" service:"
+msgstr ""
+"Klik op een onderstaande link om te zoeken naar een adreshelper via een "
+"\"jump\" service:"
+
+#. Translators: parameter is a host name
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1221
+#, java-format
+msgid "{0} jump service"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:163
+#, java-format
+msgid "Added via address helper from {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:165
+msgid "Added via address helper"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:190
+#, java-format
+msgid "Redirecting to {0}"
+msgstr "Updaten van {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:202
+#, java-format
+msgid "Saved {0} to the {1} addressbook, redirecting now."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:203
+#, java-format
+msgid "Failed to save {0} to the {1} addressbook, redirecting now."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
+msgid "Click here if you are not redirected automatically."
+msgstr ""

apps/i2ptunnel/locale-proxy/messages_pl.po

@@ -0,0 +1,453 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2ptunnel package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+#
+# Translators:
+#   <b790979@klzlk.com>, 2012.
+#   <businesshehe@yahoo.com>, 2011, 2012.
+# Smert i2p <Smert@safe-mail.net>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P i2ptunnel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-07-13 18:49+0000\n"
+"PO-Revision-Date: 2013-02-11 21:31+0000\n"
+"Last-Translator: Smert <Smert@safe-mail.net>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/I2P/language/"
+"pl/)\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+
+#: ../java/build/Proxy.java:5
+msgid "Proxy Authorization Required"
+msgstr "Autoryzacja Outproxy"
+
+#: ../java/build/Proxy.java:6
+msgid "I2P HTTP Proxy Authorization Required"
+msgstr "Autoryzacja Outproxy"
+
+#: ../java/build/Proxy.java:7
+msgid "This proxy is configured to require a username and password for access."
+msgstr ""
+
+#: ../java/build/Proxy.java:8
+#, java-format
+msgid ""
+"Please enter your username and password, or check your {0}router "
+"configuration{1} or {2}I2PTunnel configuration{3}."
+msgstr ""
+
+#: ../java/build/Proxy.java:9
+#, java-format
+msgid ""
+"To disable authorization, remove the configuration {0}i2ptunnel.proxy."
+"auth=basic{1}, then stop and restart the HTTP Proxy tunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:10 ../java/build/Proxy.java:16
+msgid "Warning: No Outproxy Configured"
+msgstr ""
+
+#: ../java/build/Proxy.java:11 ../java/build/Proxy.java:20
+#: ../java/build/Proxy.java:32 ../java/build/Proxy.java:44
+#: ../java/build/Proxy.java:52 ../java/build/Proxy.java:61
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:83
+#: ../java/build/Proxy.java:93 ../java/build/Proxy.java:103
+#: ../java/build/Proxy.java:115
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:196
+msgid "Router Console"
+msgstr "Konsola Routera"
+
+#: ../java/build/Proxy.java:12 ../java/build/Proxy.java:21
+#: ../java/build/Proxy.java:33 ../java/build/Proxy.java:45
+#: ../java/build/Proxy.java:53 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:75 ../java/build/Proxy.java:84
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:104
+#: ../java/build/Proxy.java:116
+msgid "I2P Router Console"
+msgstr "Konsola Routera"
+
+#: ../java/build/Proxy.java:13 ../java/build/Proxy.java:22
+#: ../java/build/Proxy.java:34 ../java/build/Proxy.java:46
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:76 ../java/build/Proxy.java:85
+#: ../java/build/Proxy.java:95 ../java/build/Proxy.java:105
+#: ../java/build/Proxy.java:117
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Configuration"
+msgstr "Konfiguracja"
+
+#: ../java/build/Proxy.java:14 ../java/build/Proxy.java:23
+#: ../java/build/Proxy.java:35 ../java/build/Proxy.java:47
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:77 ../java/build/Proxy.java:86
+#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:106
+#: ../java/build/Proxy.java:118
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Help"
+msgstr "Pomoc"
+
+#: ../java/build/Proxy.java:15 ../java/build/Proxy.java:24
+#: ../java/build/Proxy.java:36 ../java/build/Proxy.java:48
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:65
+#: ../java/build/Proxy.java:78 ../java/build/Proxy.java:87
+#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:107
+#: ../java/build/Proxy.java:119
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Addressbook"
+msgstr "Książka adresowa"
+
+#: ../java/build/Proxy.java:17
+msgid ""
+"Your request was for a site outside of I2P, but you have no HTTP outproxy "
+"configured."
+msgstr ""
+
+#: ../java/build/Proxy.java:18
+msgid "Please configure an outproxy in I2PTunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:19
+msgid "Information: New Host Name"
+msgstr ""
+
+#: ../java/build/Proxy.java:25
+msgid "Information: New Host Name with Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:26
+msgid ""
+"The address helper link you followed is for a new host name that is not in "
+"your address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:27
+msgid "You may save this host name to your local address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:28
+msgid ""
+"If you save it to your address book, you will not see this message again."
+msgstr ""
+
+#: ../java/build/Proxy.java:29
+msgid ""
+"If you do not save it, the host name will be forgotten after the next router "
+"restart."
+msgstr ""
+
+#: ../java/build/Proxy.java:30
+msgid ""
+"If you do not wish to visit this host, click the \"back\" button on your "
+"browser."
+msgstr ""
+
+#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:37
+msgid "Warning: Invalid Destination"
+msgstr "Cel localny"
+
+#: ../java/build/Proxy.java:38
+msgid ""
+"The eepsite destination specified was not valid, or was otherwise "
+"unreachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:39
+msgid ""
+"Perhaps you pasted in the wrong Base 64 string or the link you are following "
+"is bad."
+msgstr ""
+
+#: ../java/build/Proxy.java:40
+msgid "The I2P host could also be offline."
+msgstr ""
+
+#: ../java/build/Proxy.java:41 ../java/build/Proxy.java:123
+#, java-format
+msgid "You may want to {0}retry{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:42 ../java/build/Proxy.java:72
+#: ../java/build/Proxy.java:113 ../java/build/Proxy.java:124
+msgid "Could not find the following destination:"
+msgstr "nazwa lub cel"
+
+#: ../java/build/Proxy.java:43 ../java/build/Proxy.java:49
+msgid "Warning: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:50
+msgid "You attempted to connect to a non-I2P website or location."
+msgstr ""
+
+#: ../java/build/Proxy.java:51 ../java/build/Proxy.java:57
+msgid "Warning: Invalid Request URI"
+msgstr ""
+
+#: ../java/build/Proxy.java:58
+msgid "The request URI is invalid, and probably contains illegal characters."
+msgstr ""
+
+#: ../java/build/Proxy.java:59
+msgid ""
+"If you clicked a link, check the end of the URI for any characters the "
+"browser has mistakenly added on."
+msgstr ""
+
+#: ../java/build/Proxy.java:60
+msgid "Warning: Eepsite Unknown"
+msgstr ""
+
+#: ../java/build/Proxy.java:66
+msgid "Warning: Eepsite Not Found in Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:67
+msgid "The eepsite was not found in your router's addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:68
+msgid "Check the link or find a Base 32 or Base 64 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:69
+#, java-format
+msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:70
+msgid ""
+"Otherwise, find a Base 32 or address helper link, or use a jump service link "
+"below."
+msgstr ""
+
+#: ../java/build/Proxy.java:71
+#, java-format
+msgid ""
+"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
+"subscriptions{3} to your addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:73
+msgid "Error: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:79
+msgid "Error: Local Access"
+msgstr ""
+
+#: ../java/build/Proxy.java:80
+msgid "Your browser is misconfigured."
+msgstr ""
+
+#: ../java/build/Proxy.java:81
+msgid ""
+"Do not use the proxy to access the router console, localhost, or local LAN "
+"destinations."
+msgstr ""
+
+#: ../java/build/Proxy.java:82 ../java/build/Proxy.java:88
+msgid "Warning: Non-HTTP Protocol"
+msgstr ""
+
+#: ../java/build/Proxy.java:89
+msgid "The request uses a bad protocol."
+msgstr ""
+
+#: ../java/build/Proxy.java:90
+#, java-format
+msgid "The I2P HTTP Proxy supports {0}http://{1} requests ONLY."
+msgstr ""
+
+#: ../java/build/Proxy.java:91
+#, java-format
+msgid ""
+"Other protocols such as {0}https://{1} and {0}ftp://{1} are not allowed."
+msgstr ""
+
+#: ../java/build/Proxy.java:92 ../java/build/Proxy.java:98
+msgid "Warning: Bad Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:99
+#, java-format
+msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
+msgstr ""
+
+#: ../java/build/Proxy.java:100
+msgid "It seems to be garbage data, or a mistyped Base 32 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:101
+msgid ""
+"Check your URL to try and fix the helper key to be a valid Base 32 hostname "
+"or Base 64 key."
+msgstr ""
+
+#: ../java/build/Proxy.java:102 ../java/build/Proxy.java:108
+msgid "Warning: Outproxy Not Found"
+msgstr ""
+
+#: ../java/build/Proxy.java:109
+msgid "The HTTP Outproxy was not found."
+msgstr ""
+
+#: ../java/build/Proxy.java:110
+msgid ""
+"It is offline, there is network congestion, or your router is not yet well-"
+"integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:111
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr ""
+
+#: ../java/build/Proxy.java:112
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list {0}"
+"here{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:114 ../java/build/Proxy.java:120
+msgid "Warning: Eepsite Unreachable"
+msgstr ""
+
+#: ../java/build/Proxy.java:121
+msgid "The eepsite was not reachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:122
+msgid ""
+"The eepsite is offline, there is network congestion, or your router is not "
+"yet well-integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:126
+msgid "Warning: Destination Key Conflict"
+msgstr ""
+
+#: ../java/build/Proxy.java:127
+msgid ""
+"The addresshelper link you followed specifies a different destination key "
+"than a host entry in your host database."
+msgstr ""
+
+#: ../java/build/Proxy.java:128
+msgid ""
+"Someone could be trying to impersonate another eepsite, or people have given "
+"two eepsites identical names."
+msgstr ""
+
+#: ../java/build/Proxy.java:129
+msgid ""
+"You can resolve the conflict by considering which key you trust, and either "
+"discarding the addresshelper link, discarding the host entry from your host "
+"database, or naming one of them differently."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "This seems to be a bad destination:"
+msgstr "Wydaje się to być złym celem:"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "i2paddresshelper cannot help you with a destination like that!"
+msgstr ""
+"i2paddresshelper, pomocnik adresowy i2p, nie może pomóc ci z takim celem!"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:639
+#, 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 ""
+"By odwiedzić cel w bazie danych twojego hosta, naciśnij <a href="
+"\"{0}\">tutaj</a>. By odwiedzić konfliktujący cel pomocnika adresów, "
+"naciśnij <a href=\"{1}\">tutaj</a>."
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1043
+msgid "Host"
+msgstr "Host"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1047
+msgid "Base 32"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1051
+msgid "Destination"
+msgstr "Cel"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1057
+#, java-format
+msgid "Continue to {0} without saving"
+msgstr "Kontynuuj do {0} bez zapisywania"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1062
+#, java-format
+msgid "Save {0} to router address book and continue to eepsite"
+msgstr "Zapisz {0} do książki adresowej rutera i kontynuuj do eepsite'u"
+
+#. only blockfile supports multiple books
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1065
+#, java-format
+msgid "Save {0} to master address book and continue to eepsite"
+msgstr "Zapisz {0} do głównej książki adresowej i kontynuuj do eepsite'u"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1066
+#, java-format
+msgid "Save {0} to private address book and continue to eepsite"
+msgstr "Zapisz {0} do prywatnej książki adresowej i kontynuuj do eepsite'u"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1180
+msgid "HTTP Outproxy"
+msgstr "HTTP Outproxy"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+msgid ""
+"Click a link below to look for an address helper by using a \"jump\" service:"
+msgstr ""
+"Kliknij na poniższy link by poszukać pomocnika adresów poprzez użycie "
+"\"skaczącego\" serwisu."
+
+#. Translators: parameter is a host name
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1221
+#, java-format
+msgid "{0} jump service"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:163
+#, java-format
+msgid "Added via address helper from {0}"
+msgstr "Dodano poprzez pomocnika adresów {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:165
+msgid "Added via address helper"
+msgstr "Dodano poprzez pomocnika adresów"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:190
+#, java-format
+msgid "Redirecting to {0}"
+msgstr "Przekierowywuje do {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:202
+#, java-format
+msgid "Saved {0} to the {1} addressbook, redirecting now."
+msgstr "Zapisano {0} do książki adresowej {1}, przekierowywuje."
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:203
+#, java-format
+msgid "Failed to save {0} to the {1} addressbook, redirecting now."
+msgstr "Nie udało sie zapisać {0} do książki adresowej {1}, przkierowywuje."
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
+msgid "Click here if you are not redirected automatically."
+msgstr "Sprawdź tutaj jeżeli nie jesteś automatycznie przekierowany."

apps/i2ptunnel/locale-proxy/messages_pt.po

@@ -0,0 +1,451 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2ptunnel package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+#
+# Translators:
+# rafaelbf, 2013
+# tuliouel, 2013
+# wicked, 2012
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P i2ptunnel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-08-11 15:44+0000\n"
+"PO-Revision-Date: 2013-07-04 19:15+0000\n"
+"Last-Translator: tuliouel\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/I2P/language/"
+"pt/)\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../java/build/Proxy.java:5 ../java/build/Proxy.java:11
+msgid "Warning: Outproxy Not Found"
+msgstr ""
+
+#: ../java/build/Proxy.java:6 ../java/build/Proxy.java:18
+#: ../java/build/Proxy.java:27 ../java/build/Proxy.java:40
+#: ../java/build/Proxy.java:49 ../java/build/Proxy.java:61
+#: ../java/build/Proxy.java:69 ../java/build/Proxy.java:88
+#: ../java/build/Proxy.java:99 ../java/build/Proxy.java:111
+#: ../java/build/Proxy.java:121
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:196
+msgid "Router Console"
+msgstr "Painel do Roteador"
+
+#: ../java/build/Proxy.java:7 ../java/build/Proxy.java:19
+#: ../java/build/Proxy.java:28 ../java/build/Proxy.java:41
+#: ../java/build/Proxy.java:50 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:70 ../java/build/Proxy.java:89
+#: ../java/build/Proxy.java:100 ../java/build/Proxy.java:112
+#: ../java/build/Proxy.java:122
+msgid "I2P Router Console"
+msgstr "Painel do Roteador"
+
+#: ../java/build/Proxy.java:8 ../java/build/Proxy.java:20
+#: ../java/build/Proxy.java:29 ../java/build/Proxy.java:42
+#: ../java/build/Proxy.java:51 ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:71 ../java/build/Proxy.java:90
+#: ../java/build/Proxy.java:101 ../java/build/Proxy.java:113
+#: ../java/build/Proxy.java:123
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Configuration"
+msgstr "Configuração"
+
+#: ../java/build/Proxy.java:9 ../java/build/Proxy.java:21
+#: ../java/build/Proxy.java:30 ../java/build/Proxy.java:43
+#: ../java/build/Proxy.java:52 ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:72 ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:102 ../java/build/Proxy.java:114
+#: ../java/build/Proxy.java:124
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Help"
+msgstr "Ajuda"
+
+#: ../java/build/Proxy.java:10 ../java/build/Proxy.java:22
+#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:44
+#: ../java/build/Proxy.java:53 ../java/build/Proxy.java:65
+#: ../java/build/Proxy.java:73 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:103 ../java/build/Proxy.java:115
+#: ../java/build/Proxy.java:125
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Addressbook"
+msgstr "Livro de endereços"
+
+#: ../java/build/Proxy.java:12
+msgid "The HTTP Outproxy was not found."
+msgstr "O proxy HTTP não está alcançável"
+
+#: ../java/build/Proxy.java:13
+msgid ""
+"It is offline, there is network congestion, or your router is not yet well-"
+"integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:14
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr ""
+
+#: ../java/build/Proxy.java:15
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list {0}"
+"here{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:16 ../java/build/Proxy.java:38
+#: ../java/build/Proxy.java:59 ../java/build/Proxy.java:97
+msgid "Could not find the following destination:"
+msgstr "Destino do túnel"
+
+#: ../java/build/Proxy.java:17
+msgid "Error: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:23
+msgid "Error: Local Access"
+msgstr ""
+
+#: ../java/build/Proxy.java:24
+msgid "Your browser is misconfigured."
+msgstr "Seu navegador não suporta iFrames."
+
+#: ../java/build/Proxy.java:25
+msgid ""
+"Do not use the proxy to access the router console, localhost, or local LAN "
+"destinations."
+msgstr ""
+
+#: ../java/build/Proxy.java:26
+msgid "Warning: Eepsite Unknown"
+msgstr ""
+
+#: ../java/build/Proxy.java:32
+msgid "Warning: Eepsite Not Found in Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:33
+msgid "The eepsite was not found in your router's addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:34
+msgid "Check the link or find a Base 32 or Base 64 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:35
+#, java-format
+msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:36
+msgid ""
+"Otherwise, find a Base 32 or address helper link, or use a jump service link "
+"below."
+msgstr ""
+
+#: ../java/build/Proxy.java:37
+#, java-format
+msgid ""
+"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
+"subscriptions{3} to your addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:39 ../java/build/Proxy.java:45
+msgid "Warning: Invalid Request URI"
+msgstr ""
+
+#: ../java/build/Proxy.java:46
+msgid "The request URI is invalid, and probably contains illegal characters."
+msgstr ""
+
+#: ../java/build/Proxy.java:47
+msgid ""
+"If you clicked a link, check the end of the URI for any characters the "
+"browser has mistakenly added on."
+msgstr ""
+
+#: ../java/build/Proxy.java:48 ../java/build/Proxy.java:54
+msgid "Warning: Invalid Destination"
+msgstr "Destino local"
+
+#: ../java/build/Proxy.java:55
+msgid ""
+"The eepsite destination specified was not valid, or was otherwise "
+"unreachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:56
+msgid ""
+"Perhaps you pasted in the wrong Base 64 string or the link you are following "
+"is bad."
+msgstr ""
+
+#: ../java/build/Proxy.java:57
+msgid "The I2P host could also be offline."
+msgstr ""
+
+#: ../java/build/Proxy.java:58 ../java/build/Proxy.java:96
+#, java-format
+msgid "You may want to {0}retry{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:60 ../java/build/Proxy.java:66
+msgid "Warning: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:67
+msgid "You attempted to connect to a non-I2P website or location."
+msgstr ""
+
+#: ../java/build/Proxy.java:68 ../java/build/Proxy.java:74
+msgid "Warning: No Outproxy Configured"
+msgstr ""
+
+#: ../java/build/Proxy.java:75
+msgid ""
+"Your request was for a site outside of I2P, but you have no HTTP outproxy "
+"configured."
+msgstr ""
+
+#: ../java/build/Proxy.java:76
+msgid "Please configure an outproxy in I2PTunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:77 ../java/build/Proxy.java:78
+msgid "Warning: Destination Key Conflict"
+msgstr ""
+
+#: ../java/build/Proxy.java:79
+msgid ""
+"The addresshelper link you followed specifies a different destination key "
+"than a host entry in your host database."
+msgstr ""
+
+#: ../java/build/Proxy.java:80
+msgid ""
+"Someone could be trying to impersonate another eepsite, or people have given "
+"two eepsites identical names."
+msgstr ""
+
+#: ../java/build/Proxy.java:81
+msgid ""
+"You can resolve the conflict by considering which key you trust, and either "
+"discarding the addresshelper link, discarding the host entry from your host "
+"database, or naming one of them differently."
+msgstr ""
+
+#: ../java/build/Proxy.java:82
+msgid "Proxy Authorization Required"
+msgstr "Autorização do proxy de saída"
+
+#: ../java/build/Proxy.java:83
+msgid "I2P HTTP Proxy Authorization Required"
+msgstr "Autorização do proxy de saída"
+
+#: ../java/build/Proxy.java:84
+msgid "This proxy is configured to require a username and password for access."
+msgstr ""
+
+#: ../java/build/Proxy.java:85
+#, java-format
+msgid ""
+"Please enter your username and password, or check your {0}router "
+"configuration{1} or {2}I2PTunnel configuration{3}."
+msgstr ""
+
+#: ../java/build/Proxy.java:86
+#, java-format
+msgid ""
+"To disable authorization, remove the configuration {0}i2ptunnel.proxy."
+"auth=basic{1}, then stop and restart the HTTP Proxy tunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:93
+msgid "Warning: Eepsite Unreachable"
+msgstr ""
+
+#: ../java/build/Proxy.java:94
+msgid "The eepsite was not reachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:95
+msgid ""
+"The eepsite is offline, there is network congestion, or your router is not "
+"yet well-integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:98
+msgid "Information: New Host Name"
+msgstr ""
+
+#: ../java/build/Proxy.java:104
+msgid "Information: New Host Name with Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:105
+msgid ""
+"The address helper link you followed is for a new host name that is not in "
+"your address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:106
+msgid "You may save this host name to your local address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:107
+msgid ""
+"If you save it to your address book, you will not see this message again."
+msgstr ""
+
+#: ../java/build/Proxy.java:108
+msgid ""
+"If you do not save it, the host name will be forgotten after the next router "
+"restart."
+msgstr ""
+
+#: ../java/build/Proxy.java:109
+msgid ""
+"If you do not wish to visit this host, click the \"back\" button on your "
+"browser."
+msgstr ""
+
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:116
+msgid "Warning: Bad Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:117
+#, java-format
+msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
+msgstr ""
+
+#: ../java/build/Proxy.java:118
+msgid "It seems to be garbage data, or a mistyped Base 32 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:119
+msgid ""
+"Check your URL to try and fix the helper key to be a valid Base 32 hostname "
+"or Base 64 key."
+msgstr ""
+
+#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:126
+msgid "Warning: Non-HTTP Protocol"
+msgstr ""
+
+#: ../java/build/Proxy.java:127
+msgid "The request uses a bad protocol."
+msgstr ""
+
+#: ../java/build/Proxy.java:128
+#, java-format
+msgid "The I2P HTTP Proxy supports {0}http://{1} requests ONLY."
+msgstr ""
+
+#: ../java/build/Proxy.java:129
+#, java-format
+msgid ""
+"Other protocols such as {0}https://{1} and {0}ftp://{1} are not allowed."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "This seems to be a bad destination:"
+msgstr "Este destino parece estar incorreto:"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "i2paddresshelper cannot help you with a destination like that!"
+msgstr "Auxiliar de endereços não pode ajudar em destinos como este!"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:639
+#, 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 ""
+"Para visitar o destino da sua base de dados, clique <a href=\"{0}\">aqui</"
+"a>. Para visitar o endereço de ajuda do conflito, clique <a href="
+"\"{1}\">aqui</a>."
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1043
+msgid "Host"
+msgstr "Host"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1047
+msgid "Base 32"
+msgstr "Base 32"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1051
+msgid "Destination"
+msgstr "Destino"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1057
+#, java-format
+msgid "Continue to {0} without saving"
+msgstr "Continuar para {0} sem salvar"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1062
+#, java-format
+msgid "Save {0} to router address book and continue to eepsite"
+msgstr "Salvar {0} ao livro de endereços do roteador e continuar no eepsite"
+
+#. only blockfile supports multiple books
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1065
+#, java-format
+msgid "Save {0} to master address book and continue to eepsite"
+msgstr "Salvar {0} ao livro de endereços master e continuar no eepsite"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1066
+#, java-format
+msgid "Save {0} to private address book and continue to eepsite"
+msgstr "Salvar {0} no livro de endereços particular e continuar no eepsite"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1180
+msgid "HTTP Outproxy"
+msgstr "Proxy de saída HTTP"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1216
+msgid ""
+"Click a link below to look for an address helper by using a \"jump\" service:"
+msgstr ""
+"Clique no link abaixo para procurar um ajudante de endereços usando um "
+"serviço \"jump\":"
+
+#. Translators: parameter is a host name
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1224
+#, java-format
+msgid "{0} jump service"
+msgstr "{0} serviço de salto"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:163
+#, java-format
+msgid "Added via address helper from {0}"
+msgstr "Adicionado pelo auxiliar de endereços de {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:165
+msgid "Added via address helper"
+msgstr "Adicionado pelo auxiliar de endereços"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:190
+#, java-format
+msgid "Redirecting to {0}"
+msgstr "Redirecionando para {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:202
+#, java-format
+msgid "Saved {0} to the {1} addressbook, redirecting now."
+msgstr "{0} salvo no livro de endereços {1}, redirecionando agora."
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:203
+#, java-format
+msgid "Failed to save {0} to the {1} addressbook, redirecting now."
+msgstr "Falha ao salvar {0} no livro de endereços {1}, redirecionando agora."
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
+msgid "Click here if you are not redirected automatically."
+msgstr "Clique aqui se você não for redirecionado automaticamente."

apps/i2ptunnel/locale-proxy/messages_ru.po

@@ -0,0 +1,499 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2ptunnel package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+#
+# Translators:
+# Андрей Лукьяненко <operru32@yandex.ru>, 2013
+# ducki2p <ducki2p@gmail.com>, 2011
+# foo <foo@bar>, 2009
+# gmind, 2012-2013
+# sfix <anon-9b36b2e@lycos.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-20 10:17+0000\n"
+"PO-Revision-Date: 2013-09-14 22:04+0000\n"
+"Last-Translator: Андрей Лукьяненко <operru32@yandex.ru>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/I2P/"
+"language/ru_RU/)\n"
+"Language: ru_RU\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../java/build/Proxy.java:5 ../java/build/Proxy.java:11
+msgid "Warning: Outproxy Not Found"
+msgstr "Предупреждение: Выходной прокси-сервер недоступен"
+
+#: ../java/build/Proxy.java:6 ../java/build/Proxy.java:18
+#: ../java/build/Proxy.java:27 ../java/build/Proxy.java:40
+#: ../java/build/Proxy.java:49 ../java/build/Proxy.java:61
+#: ../java/build/Proxy.java:69 ../java/build/Proxy.java:88
+#: ../java/build/Proxy.java:99 ../java/build/Proxy.java:111
+#: ../java/build/Proxy.java:121
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:196
+msgid "Router Console"
+msgstr "Консоль маршрутизатора I2P"
+
+#: ../java/build/Proxy.java:7 ../java/build/Proxy.java:19
+#: ../java/build/Proxy.java:28 ../java/build/Proxy.java:41
+#: ../java/build/Proxy.java:50 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:70 ../java/build/Proxy.java:89
+#: ../java/build/Proxy.java:100 ../java/build/Proxy.java:112
+#: ../java/build/Proxy.java:122
+msgid "I2P Router Console"
+msgstr "Консоль маршрутизатора I2P"
+
+#: ../java/build/Proxy.java:8 ../java/build/Proxy.java:20
+#: ../java/build/Proxy.java:29 ../java/build/Proxy.java:42
+#: ../java/build/Proxy.java:51 ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:71 ../java/build/Proxy.java:90
+#: ../java/build/Proxy.java:101 ../java/build/Proxy.java:113
+#: ../java/build/Proxy.java:123
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Configuration"
+msgstr "Настройки"
+
+#: ../java/build/Proxy.java:9 ../java/build/Proxy.java:21
+#: ../java/build/Proxy.java:30 ../java/build/Proxy.java:43
+#: ../java/build/Proxy.java:52 ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:72 ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:102 ../java/build/Proxy.java:114
+#: ../java/build/Proxy.java:124
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Help"
+msgstr "Помощь"
+
+#: ../java/build/Proxy.java:10 ../java/build/Proxy.java:22
+#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:44
+#: ../java/build/Proxy.java:53 ../java/build/Proxy.java:65
+#: ../java/build/Proxy.java:73 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:103 ../java/build/Proxy.java:115
+#: ../java/build/Proxy.java:125
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Addressbook"
+msgstr "Адресная книга"
+
+#: ../java/build/Proxy.java:12
+msgid "The HTTP Outproxy was not found."
+msgstr "HTTP-прокси не поднят"
+
+#: ../java/build/Proxy.java:13
+msgid ""
+"It is offline, there is network congestion, or your router is not yet well-"
+"integrated with peers."
+msgstr ""
+"Возможно, он отключен, сеть перегружена или ваш маршрутизатор недостаточно "
+"интегрирован с другими узлами."
+
+#: ../java/build/Proxy.java:14
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr ""
+"Вы можете {0}повторить{1} операцию (это случайным образом выберет прокси-"
+"сервер из определенного {2}здесь{3} списка, если вы настроили более одного "
+"прокси-сервера)."
+
+#: ../java/build/Proxy.java:15
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list {0}"
+"here{1}."
+msgstr ""
+"Если проблема продолжит появляться, вы можете изменить список прокси-"
+"серверов {0}здесь{1}."
+
+#: ../java/build/Proxy.java:16 ../java/build/Proxy.java:38
+#: ../java/build/Proxy.java:59 ../java/build/Proxy.java:97
+msgid "Could not find the following destination:"
+msgstr "Назначение туннеля"
+
+#: ../java/build/Proxy.java:17
+msgid "Error: Request Denied"
+msgstr "Ошибка: Отказ в выполнении запроса"
+
+#: ../java/build/Proxy.java:23
+msgid "Error: Local Access"
+msgstr "Ошибка: Локальный адрес"
+
+#: ../java/build/Proxy.java:24
+msgid "Your browser is misconfigured."
+msgstr "Ваш браузер не поддерживает iFrames"
+
+#: ../java/build/Proxy.java:25
+msgid ""
+"Do not use the proxy to access the router console, localhost, or local LAN "
+"destinations."
+msgstr ""
+"Не используйте прокси-сервер для доступа к консоли маршрутизатора, "
+"локальному компьютеру или локальной сети."
+
+#: ../java/build/Proxy.java:26
+msgid "Warning: Eepsite Unknown"
+msgstr "Предупреждение: Неизвестный сайт I2P"
+
+#: ../java/build/Proxy.java:32
+msgid "Warning: Eepsite Not Found in Addressbook"
+msgstr "Предупреждение: Сайт I2P не найден в адресной книге"
+
+#: ../java/build/Proxy.java:33
+msgid "The eepsite was not found in your router's addressbook."
+msgstr "Сайт I2P не найден в адресной книге вашего маршрутизатора."
+
+#: ../java/build/Proxy.java:34
+msgid "Check the link or find a Base 32 or Base 64 address."
+msgstr "Проверьте ссылку или найдите адрес Base32 или Base64."
+
+#: ../java/build/Proxy.java:35
+#, java-format
+msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
+msgstr "Если у вас есть адрес Base64, {0}добавьте его в адресную книгу{1}."
+
+#: ../java/build/Proxy.java:36
+msgid ""
+"Otherwise, find a Base 32 or address helper link, or use a jump service link "
+"below."
+msgstr ""
+"В противном случае найдите ссылку Base32 или AddressHelper или используйте "
+"Jump-службу."
+
+#: ../java/build/Proxy.java:37
+#, java-format
+msgid ""
+"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
+"subscriptions{3} to your addressbook."
+msgstr ""
+"Если вы слишком часто попадаете на эту страницу, то обратитесь к {0}FAQ{1} "
+"за инструкциями по {2}добавлению подписок{3} адресной книги."
+
+#: ../java/build/Proxy.java:39 ../java/build/Proxy.java:45
+msgid "Warning: Invalid Request URI"
+msgstr "Предупреждение: Некорректный URI запроса"
+
+#: ../java/build/Proxy.java:46
+msgid "The request URI is invalid, and probably contains illegal characters."
+msgstr "Некорректный URI запроса. Возможно, он содержит недопустимые символы."
+
+#: ../java/build/Proxy.java:47
+msgid ""
+"If you clicked a link, check the end of the URI for any characters the "
+"browser has mistakenly added on."
+msgstr ""
+"Если вы прошли по ссылке, проверьте конец URI на наличие символов, ошибочно "
+"добавленных браузером."
+
+#: ../java/build/Proxy.java:48 ../java/build/Proxy.java:54
+msgid "Warning: Invalid Destination"
+msgstr "Локальный адрес назначения"
+
+#: ../java/build/Proxy.java:55
+msgid ""
+"The eepsite destination specified was not valid, or was otherwise "
+"unreachable."
+msgstr "Указанный адрес недействителен или недоступен."
+
+#: ../java/build/Proxy.java:56
+msgid ""
+"Perhaps you pasted in the wrong Base 64 string or the link you are following "
+"is bad."
+msgstr ""
+"Возможно, вы вставили неправильную строку Base64 или прошли по нерабочей "
+"ссылке."
+
+#: ../java/build/Proxy.java:57
+msgid "The I2P host could also be offline."
+msgstr "Сайт I2P также может быть отключен."
+
+#: ../java/build/Proxy.java:58 ../java/build/Proxy.java:96
+#, java-format
+msgid "You may want to {0}retry{1}."
+msgstr "Вы можете {0}повторить{1} операцию."
+
+#: ../java/build/Proxy.java:60 ../java/build/Proxy.java:66
+msgid "Warning: Request Denied"
+msgstr "Предупреждение: Отказ в выполнении запроса"
+
+#: ../java/build/Proxy.java:67
+msgid "You attempted to connect to a non-I2P website or location."
+msgstr "Вы попытались соединиться с сайтом не в сети I2P."
+
+#: ../java/build/Proxy.java:68 ../java/build/Proxy.java:74
+msgid "Warning: No Outproxy Configured"
+msgstr "Предупреждение: Выходной прокси-сервер не настроен"
+
+#: ../java/build/Proxy.java:75
+msgid ""
+"Your request was for a site outside of I2P, but you have no HTTP outproxy "
+"configured."
+msgstr ""
+"Вы запросили страницу вне сети I2P, но не имеете настроенного выходного "
+"прокси-сервера."
+
+#: ../java/build/Proxy.java:76
+msgid "Please configure an outproxy in I2PTunnel."
+msgstr "Пожалуйста, настройте выходной прокси-сервер в I2PTunnel."
+
+#: ../java/build/Proxy.java:77 ../java/build/Proxy.java:78
+msgid "Warning: Destination Key Conflict"
+msgstr "Предупреждение: Конфликт ключа назначения"
+
+#: ../java/build/Proxy.java:79
+msgid ""
+"The addresshelper link you followed specifies a different destination key "
+"than a host entry in your host database."
+msgstr ""
+"Ссылка AddressHelper, по которой вы прошли, определяет ключ назначения, "
+"отличный от указанного в адресной книге."
+
+#: ../java/build/Proxy.java:80
+msgid ""
+"Someone could be trying to impersonate another eepsite, or people have given "
+"two eepsites identical names."
+msgstr ""
+"Кто-то может пытаться выдать себя за другой сайт или разные люди дали двум "
+"сайтам одинаковые имена."
+
+#: ../java/build/Proxy.java:81
+msgid ""
+"You can resolve the conflict by considering which key you trust, and either "
+"discarding the addresshelper link, discarding the host entry from your host "
+"database, or naming one of them differently."
+msgstr ""
+"Для разрешения конфликта вы можете определить, какому ключу вы доверяете, и "
+"либо отказаться от прохода по ссылке, либо удалить старый ключ, либо "
+"присвоить одному из них другое имя."
+
+#: ../java/build/Proxy.java:82
+msgid "Proxy Authorization Required"
+msgstr "Авторизация outproxy"
+
+#: ../java/build/Proxy.java:83
+msgid "I2P HTTP Proxy Authorization Required"
+msgstr "Авторизация outproxy"
+
+#: ../java/build/Proxy.java:84
+msgid "This proxy is configured to require a username and password for access."
+msgstr "Этот прокси-сервер требует имя пользователя и пароль для доступа."
+
+#: ../java/build/Proxy.java:85
+#, java-format
+msgid ""
+"Please enter your username and password, or check your {0}router "
+"configuration{1} or {2}I2PTunnel configuration{3}."
+msgstr ""
+"Введите имя и пароль или проверьте ваши {0}настройки маршрутизатора{1} и {2}"
+"настройки I2PTunnel{3}."
+
+#: ../java/build/Proxy.java:86
+#, java-format
+msgid ""
+"To disable authorization, remove the configuration {0}i2ptunnel.proxy."
+"auth=basic{1}, then stop and restart the HTTP Proxy tunnel."
+msgstr ""
+"Для отключения авторизации удалите строку {0}i2ptunnel.proxy.auth=basic{1} и "
+"перезапустите туннель HTTP Proxy."
+
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:93
+msgid "Warning: Eepsite Unreachable"
+msgstr "Предупреждение: Сайт I2P недоступен"
+
+#: ../java/build/Proxy.java:94
+msgid "The eepsite was not reachable."
+msgstr "Сайт I2P недоступен."
+
+#: ../java/build/Proxy.java:95
+msgid ""
+"The eepsite is offline, there is network congestion, or your router is not "
+"yet well-integrated with peers."
+msgstr ""
+"Возможно, он отключен, сеть перегружена или ваш маршрутизатор недостаточно "
+"интегрирован с другими узлами."
+
+#: ../java/build/Proxy.java:98
+msgid "Information: New Host Name"
+msgstr "Информация: Новый доменной адрес"
+
+#: ../java/build/Proxy.java:104
+msgid "Information: New Host Name with Address Helper"
+msgstr "Информация: Новый доменной адрес с AddressHelper"
+
+#: ../java/build/Proxy.java:105
+msgid ""
+"The address helper link you followed is for a new host name that is not in "
+"your address book."
+msgstr ""
+"Ссылка AddressHelper, по которой вы прошли, ведет на домен, не внесенный в "
+"адресную книгу."
+
+#: ../java/build/Proxy.java:106
+msgid "You may save this host name to your local address book."
+msgstr "Вы можете сохранить этот домен в свою локальную адресную книгу."
+
+#: ../java/build/Proxy.java:107
+msgid ""
+"If you save it to your address book, you will not see this message again."
+msgstr ""
+"Если вы сохраните его в вашей адресной книге, вы больше не будете видеть это "
+"сообщение."
+
+#: ../java/build/Proxy.java:108
+msgid ""
+"If you do not save it, the host name will be forgotten after the next router "
+"restart."
+msgstr ""
+"Если вы не сохраните его, он будет «забыт» после перезапуска маршрутизатора."
+
+#: ../java/build/Proxy.java:109
+msgid ""
+"If you do not wish to visit this host, click the \"back\" button on your "
+"browser."
+msgstr ""
+"Если вы не хотите посещать этот сайт, нажмите кнопку «Назад» в браузере."
+
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:116
+msgid "Warning: Bad Address Helper"
+msgstr "Предупреждение: Некорректный AddressHelper"
+
+#: ../java/build/Proxy.java:117
+#, java-format
+msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
+msgstr "Не удается разобрать ключ AddressHelper ({0}i2paddresshelper={1})."
+
+#: ../java/build/Proxy.java:118
+msgid "It seems to be garbage data, or a mistyped Base 32 address."
+msgstr "Возможно, он содержит ненужные данные или опечатку в адресе Base32."
+
+#: ../java/build/Proxy.java:119
+msgid ""
+"Check your URL to try and fix the helper key to be a valid Base 32 hostname "
+"or Base 64 key."
+msgstr ""
+"Проверьте URL и попробуйте исправить ссылку с использованием корректной "
+"ссылки Base32 или Base64."
+
+#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:126
+msgid "Warning: Non-HTTP Protocol"
+msgstr "Предупреждение: Протокол не HTTP"
+
+#: ../java/build/Proxy.java:127
+msgid "The request uses a bad protocol."
+msgstr "Запрос отправлен через неподдерживанмый протокол."
+
+#: ../java/build/Proxy.java:128
+#, java-format
+msgid "The I2P HTTP Proxy supports {0}http://{1} requests ONLY."
+msgstr "HTTP-прокси I2P поддерживает ТОЛЬКО протокол {0}http://{1}."
+
+#: ../java/build/Proxy.java:129
+#, java-format
+msgid ""
+"Other protocols such as {0}https://{1} and {0}ftp://{1} are not allowed."
+msgstr ""
+"Другие протоколы, такие как {0}https://{1} и {0}ftp://{1} не поддерживаются."
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "This seems to be a bad destination:"
+msgstr "Кажется это плохой адрес назначения:"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "i2paddresshelper cannot help you with a destination like that!"
+msgstr "С таким адресом назначения i2paddresshelper вам не поможет!"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:639
+#, 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:1043
+msgid "Host"
+msgstr "Адрес"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1047
+msgid "Base 32"
+msgstr "Base 32"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1051
+msgid "Destination"
+msgstr "Адрес назначения"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1057
+#, java-format
+msgid "Continue to {0} without saving"
+msgstr "Продолжить переход к {0} без сохранения"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1062
+#, java-format
+msgid "Save {0} to router address book and continue to eepsite"
+msgstr ""
+"Сохранить {0} в адресную книгу роутера (router address book) и продолжить "
+"переход к eep-сайту"
+
+#. only blockfile supports multiple books
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1065
+#, java-format
+msgid "Save {0} to master address book and continue to eepsite"
+msgstr ""
+"Сохранить {0} в основную (master) адресную книгу и продолжить переход к eep-"
+"сайту"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1066
+#, java-format
+msgid "Save {0} to private address book and continue to eepsite"
+msgstr ""
+"Сохранить {0} в приватную адресную книгу и продолжить переход к eep-сайту"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1180
+msgid "HTTP Outproxy"
+msgstr "HTTP Outproxy"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1216
+msgid ""
+"Click a link below to look for an address helper by using a \"jump\" service:"
+msgstr ""
+"Jump-сервисы, которые, возможно, знают нужную Вам addresshelper-ссылку:"
+
+#. Translators: parameter is a host name
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1224
+#, java-format
+msgid "{0} jump service"
+msgstr "{0} jump service"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:163
+#, java-format
+msgid "Added via address helper from {0}"
+msgstr "Добавлено через address helper из {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:165
+msgid "Added via address helper"
+msgstr "Добавлен через address helper"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:190
+#, java-format
+msgid "Redirecting to {0}"
+msgstr "Перенаправляем к {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:202
+#, java-format
+msgid "Saved {0} to the {1} addressbook, redirecting now."
+msgstr "{0} сохранён в {1}, перенаправляем."
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:203
+#, java-format
+msgid "Failed to save {0} to the {1} addressbook, redirecting now."
+msgstr "Не удалось сохранить {0} в {1} адресную книгу, перенаправляем."
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
+msgid "Click here if you are not redirected automatically."
+msgstr "Нажмите сюда если автоматическое перенаправление не сработало"

apps/i2ptunnel/locale-proxy/messages_sv.po

@@ -0,0 +1,496 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2ptunnel package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+#
+# Translators:
+# hottuna <i2p@robertfoss.se>, 2013
+# hottuna <i2p@robertfoss.se>, 2012
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-26 21:42+0000\n"
+"PO-Revision-Date: 2013-09-26 06:34+0000\n"
+"Last-Translator: hottuna <i2p@robertfoss.se>\n"
+"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/I2P/"
+"language/sv_SE/)\n"
+"Language: sv_SE\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../java/build/Proxy.java:5 ../java/build/Proxy.java:11
+msgid "Warning: Outproxy Not Found"
+msgstr "Varning: Utproxy Ej Hittad"
+
+#: ../java/build/Proxy.java:6 ../java/build/Proxy.java:18
+#: ../java/build/Proxy.java:27 ../java/build/Proxy.java:40
+#: ../java/build/Proxy.java:49 ../java/build/Proxy.java:61
+#: ../java/build/Proxy.java:69 ../java/build/Proxy.java:88
+#: ../java/build/Proxy.java:99 ../java/build/Proxy.java:111
+#: ../java/build/Proxy.java:121
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:196
+msgid "Router Console"
+msgstr "Routerkonsol"
+
+#: ../java/build/Proxy.java:7 ../java/build/Proxy.java:19
+#: ../java/build/Proxy.java:28 ../java/build/Proxy.java:41
+#: ../java/build/Proxy.java:50 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:70 ../java/build/Proxy.java:89
+#: ../java/build/Proxy.java:100 ../java/build/Proxy.java:112
+#: ../java/build/Proxy.java:122
+msgid "I2P Router Console"
+msgstr "Routerkonsol"
+
+#: ../java/build/Proxy.java:8 ../java/build/Proxy.java:20
+#: ../java/build/Proxy.java:29 ../java/build/Proxy.java:42
+#: ../java/build/Proxy.java:51 ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:71 ../java/build/Proxy.java:90
+#: ../java/build/Proxy.java:101 ../java/build/Proxy.java:113
+#: ../java/build/Proxy.java:123
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Configuration"
+msgstr "Konfiguration"
+
+#: ../java/build/Proxy.java:9 ../java/build/Proxy.java:21
+#: ../java/build/Proxy.java:30 ../java/build/Proxy.java:43
+#: ../java/build/Proxy.java:52 ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:72 ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:102 ../java/build/Proxy.java:114
+#: ../java/build/Proxy.java:124
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Help"
+msgstr "Hjälp"
+
+#: ../java/build/Proxy.java:10 ../java/build/Proxy.java:22
+#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:44
+#: ../java/build/Proxy.java:53 ../java/build/Proxy.java:65
+#: ../java/build/Proxy.java:73 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:103 ../java/build/Proxy.java:115
+#: ../java/build/Proxy.java:125
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Addressbook"
+msgstr "Adressbok"
+
+#: ../java/build/Proxy.java:12
+msgid "The HTTP Outproxy was not found."
+msgstr "HTTP Utproxyn hittades ej."
+
+#: ../java/build/Proxy.java:13
+msgid ""
+"It is offline, there is network congestion, or your router is not yet well-"
+"integrated with peers."
+msgstr ""
+"Den är antingen offline, nätverket är under stor belastning eller så är din "
+"router ännu inte väl integrerad med peers."
+
+#: ../java/build/Proxy.java:14
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr ""
+"Du kanske vill {0}försöka igen{1} eftersom en ny utproxy kommer väljas "
+"slumpmässigt utav de som är definierade {2}här{3} (om du har mer än en "
+"inställd)."
+
+#: ../java/build/Proxy.java:15
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list {0}"
+"here{1}."
+msgstr ""
+"Om du fortsätter att ha problem, så kanske du vill ändra din utproxy-liste "
+"{0}här{1}."
+
+#: ../java/build/Proxy.java:16 ../java/build/Proxy.java:38
+#: ../java/build/Proxy.java:59 ../java/build/Proxy.java:97
+msgid "Could not find the following destination:"
+msgstr "Kunde inte hitta följande mål:"
+
+#: ../java/build/Proxy.java:17
+msgid "Error: Request Denied"
+msgstr "Fel: Förfrågan Nekad"
+
+#: ../java/build/Proxy.java:23
+msgid "Error: Local Access"
+msgstr "Fel: Lokal Åtkomst"
+
+#: ../java/build/Proxy.java:24
+msgid "Your browser is misconfigured."
+msgstr "Din webbläsare är felkonfigurerad."
+
+#: ../java/build/Proxy.java:25
+msgid ""
+"Do not use the proxy to access the router console, localhost, or local LAN "
+"destinations."
+msgstr ""
+"Använd inte proxyn för åtkomst till routerkonsolen, localhost eller lokala "
+"LAN mål."
+
+#: ../java/build/Proxy.java:26
+msgid "Warning: Eepsite Unknown"
+msgstr "Varning: Okänd Eepsite"
+
+#: ../java/build/Proxy.java:32
+msgid "Warning: Eepsite Not Found in Addressbook"
+msgstr "Varning: Eepsite Finns Inte i Adressboken"
+
+#: ../java/build/Proxy.java:33
+msgid "The eepsite was not found in your router's addressbook."
+msgstr "Eepsite:n hittades inte i din routers adressbok."
+
+#: ../java/build/Proxy.java:34
+msgid "Check the link or find a Base 32 or Base 64 address."
+msgstr "Kontrollera länken eller hitta en Base32 eller Base64 adress."
+
+#: ../java/build/Proxy.java:35
+#, java-format
+msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
+msgstr "Om du har en Base64-adress, {0}lägg till den till din adressbok{1}."
+
+#: ../java/build/Proxy.java:36
+msgid ""
+"Otherwise, find a Base 32 or address helper link, or use a jump service link "
+"below."
+msgstr ""
+"Annars, hitta en Base32 eller adresshjälpar-länk eller använder en hopp-"
+"tjänst länk nedan."
+
+#: ../java/build/Proxy.java:37
+#, java-format
+msgid ""
+"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
+"subscriptions{3} to your addressbook."
+msgstr ""
+"Ser du denhär sidan ofta? Kika i {0}FAQ:en{1} efter hjälp med att {2}lägga "
+"till några prenumerationer{3} till din adressbok."
+
+#: ../java/build/Proxy.java:39 ../java/build/Proxy.java:45
+msgid "Warning: Invalid Request URI"
+msgstr "Varning: Ogiltig URI Begärd"
+
+#: ../java/build/Proxy.java:46
+msgid "The request URI is invalid, and probably contains illegal characters."
+msgstr ""
+"Den begärde URI:n är ogiltig och innehåller troligtvis ogiltiga tecken."
+
+#: ../java/build/Proxy.java:47
+msgid ""
+"If you clicked a link, check the end of the URI for any characters the "
+"browser has mistakenly added on."
+msgstr ""
+"Om du klicka på en länk, kontrollera slutet av URI:n efter andra tecken som "
+"webbläsaren av misstag lagt till."
+
+#: ../java/build/Proxy.java:48 ../java/build/Proxy.java:54
+msgid "Warning: Invalid Destination"
+msgstr "Varning: Ogiltigt Mål"
+
+#: ../java/build/Proxy.java:55
+msgid ""
+"The eepsite destination specified was not valid, or was otherwise "
+"unreachable."
+msgstr ""
+"Eepsite målet som specificerades är inte giltigt eller kan annars ej nås."
+
+#: ../java/build/Proxy.java:56
+msgid ""
+"Perhaps you pasted in the wrong Base 64 string or the link you are following "
+"is bad."
+msgstr ""
+"Kanske kopierade du in fel Base64 sträng eller så är länken du följer dålig."
+
+#: ../java/build/Proxy.java:57
+msgid "The I2P host could also be offline."
+msgstr "I2P-värden kan också vara offline."
+
+#: ../java/build/Proxy.java:58 ../java/build/Proxy.java:96
+#, java-format
+msgid "You may want to {0}retry{1}."
+msgstr "Du kanske vill {0}försöka igen{1}."
+
+#: ../java/build/Proxy.java:60 ../java/build/Proxy.java:66
+msgid "Warning: Request Denied"
+msgstr "Varning: Förfrågan Nekad"
+
+#: ../java/build/Proxy.java:67
+msgid "You attempted to connect to a non-I2P website or location."
+msgstr "Du försökte ansluta till en icke-I2P webbsida eller plats."
+
+#: ../java/build/Proxy.java:68 ../java/build/Proxy.java:74
+msgid "Warning: No Outproxy Configured"
+msgstr "Varning: Ingen Utproxy Inställd"
+
+#: ../java/build/Proxy.java:75
+msgid ""
+"Your request was for a site outside of I2P, but you have no HTTP outproxy "
+"configured."
+msgstr ""
+"Din förfrågan var för en sida utanför I2P, men du har ingen HTTP utproxy "
+"inställd."
+
+#: ../java/build/Proxy.java:76
+msgid "Please configure an outproxy in I2PTunnel."
+msgstr "Var god ställ in en utproxy i I2PTunnel."
+
+#: ../java/build/Proxy.java:77 ../java/build/Proxy.java:78
+msgid "Warning: Destination Key Conflict"
+msgstr "Varning: Konflikt för Mål-nyckeln"
+
+#: ../java/build/Proxy.java:79
+msgid ""
+"The addresshelper link you followed specifies a different destination key "
+"than a host entry in your host database."
+msgstr ""
+"Adresshjälpar-länken du följde specifierad en annan mål-nyckel än för den "
+"värd som finns i din värd-databas."
+
+#: ../java/build/Proxy.java:80
+msgid ""
+"Someone could be trying to impersonate another eepsite, or people have given "
+"two eepsites identical names."
+msgstr ""
+"Någon kanske försöker utge sig för att vara en annan eepsite eller personer "
+"kan ha givit eepsites identiska namn."
+
+#: ../java/build/Proxy.java:81
+msgid ""
+"You can resolve the conflict by considering which key you trust, and either "
+"discarding the addresshelper link, discarding the host entry from your host "
+"database, or naming one of them differently."
+msgstr ""
+"Du kan lösa konflikten genom att överväga vilken nyckel du litar på och "
+"antingen kasta bort adresshjälpar-länken, kasta bort värdnamnet från din "
+"värd-databas eller namnge dom olikt."
+
+#: ../java/build/Proxy.java:82
+msgid "Proxy Authorization Required"
+msgstr "Proxy Tillstånd Krävs"
+
+#: ../java/build/Proxy.java:83
+msgid "I2P HTTP Proxy Authorization Required"
+msgstr "I2P HTTP Proxy Tillstånd Krävs"
+
+#: ../java/build/Proxy.java:84
+msgid "This proxy is configured to require a username and password for access."
+msgstr ""
+"Denhär proxy är inställd till att kräva användarnamn och lösenord för "
+"åtkomst."
+
+#: ../java/build/Proxy.java:85
+#, java-format
+msgid ""
+"Please enter your username and password, or check your {0}router "
+"configuration{1} or {2}I2PTunnel configuration{3}."
+msgstr ""
+"Var god ange ditt användarnamn och lösenord eller kontrollera din {0}router-"
+"konfiguration{1} eller {2}I2PTunnel-konfiguration{3}."
+
+#: ../java/build/Proxy.java:86
+#, java-format
+msgid ""
+"To disable authorization, remove the configuration {0}i2ptunnel.proxy."
+"auth=basic{1}, then stop and restart the HTTP Proxy tunnel."
+msgstr ""
+"För att slå av autentisering, ta bort inställningen {0}i2ptunnel.proxy."
+"auth=basic{1}, stanna och starta sedan om  HTTP Porxy tunneln."
+
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:93
+msgid "Warning: Eepsite Unreachable"
+msgstr "Varning: Eepsite Kan Ej Nås"
+
+#: ../java/build/Proxy.java:94
+msgid "The eepsite was not reachable."
+msgstr "Eepsiten var inte nåbar."
+
+#: ../java/build/Proxy.java:95
+msgid ""
+"The eepsite is offline, there is network congestion, or your router is not "
+"yet well-integrated with peers."
+msgstr ""
+"Eepsiten är offline, nätverket är uner hög belastning eller din router är "
+"ännu inte väl integrerad med peers."
+
+#: ../java/build/Proxy.java:98
+msgid "Information: New Host Name"
+msgstr "Information: Nytt Värdnamn"
+
+#: ../java/build/Proxy.java:104
+msgid "Information: New Host Name with Address Helper"
+msgstr "Information: Nytt Värdnamn med Adresshjälpare"
+
+#: ../java/build/Proxy.java:105
+msgid ""
+"The address helper link you followed is for a new host name that is not in "
+"your address book."
+msgstr ""
+"Adressjälpar-länken du följde är för ett nytt värdnamn som inte är i din "
+"adressbok."
+
+#: ../java/build/Proxy.java:106
+msgid "You may save this host name to your local address book."
+msgstr "Du kan spara detta värdnamn i din lokala adressbok."
+
+#: ../java/build/Proxy.java:107
+msgid ""
+"If you save it to your address book, you will not see this message again."
+msgstr ""
+"Om du sparar det i din adressbok, så kommer du inte se dethär meddelandet "
+"igen."
+
+#: ../java/build/Proxy.java:108
+msgid ""
+"If you do not save it, the host name will be forgotten after the next router "
+"restart."
+msgstr ""
+"Om du inte sparar det, så kommer värdnamnet glömmas bort efter nästa router-"
+"omstart."
+
+#: ../java/build/Proxy.java:109
+msgid ""
+"If you do not wish to visit this host, click the \"back\" button on your "
+"browser."
+msgstr ""
+"Om du inte vill besöka värden, klicka på \"tillbaka\"-knappen i din "
+"webbläsare."
+
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:116
+msgid "Warning: Bad Address Helper"
+msgstr "Varning: Dålig Adresshjälpare"
+
+#: ../java/build/Proxy.java:117
+#, java-format
+msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
+msgstr ""
+"Hjälpar-nyckeln i URL:en ({0}i2paddresshelper={1}) är inte möjlig att hitta."
+
+#: ../java/build/Proxy.java:118
+msgid "It seems to be garbage data, or a mistyped Base 32 address."
+msgstr "Det verkar vara skräp-data eller en felskriven Base32 adress."
+
+#: ../java/build/Proxy.java:119
+msgid ""
+"Check your URL to try and fix the helper key to be a valid Base 32 hostname "
+"or Base 64 key."
+msgstr ""
+"Kontrollera din URL för att försöka fixa hjälpar-nyckeln så att den är ett "
+"giltigt Base32 värdnamn eller Base64 nyckel."
+
+#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:126
+msgid "Warning: Non-HTTP Protocol"
+msgstr "Varning: Ej HTTP Protokoll"
+
+#: ../java/build/Proxy.java:127
+msgid "The request uses a bad protocol."
+msgstr "Förfrågan använder ett dåligt protokoll."
+
+#: ../java/build/Proxy.java:128
+#, java-format
+msgid "The I2P HTTP Proxy supports {0}http://{1} requests ONLY."
+msgstr "I2P HTTP Proxyn stödjer ENBART {0}http://{1} frågor."
+
+#: ../java/build/Proxy.java:129
+#, java-format
+msgid ""
+"Other protocols such as {0}https://{1} and {0}ftp://{1} are not allowed."
+msgstr "Andra protokoll som {0}https://{1} och {0}ftp://{1} är inte tillåtna."
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "This seems to be a bad destination:"
+msgstr "Detta verkar vara ett felaktigt mål"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "i2paddresshelper cannot help you with a destination like that!"
+msgstr "i2padresshjälp kan inte hjälpa dig med ett sådant  mål!"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:639
+#, 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 ""
+"För att besöka målet i din värd databas href=\"{0}\"> klicka <a här </ a>. "
+"För att besöka de motstridiga hjälpaddresserna,<a href=\"{1}\"> klicka <a "
+"här </ a>."
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1043
+msgid "Host"
+msgstr "Värd"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1047
+msgid "Base 32"
+msgstr "Bas 32"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1051
+msgid "Destination"
+msgstr "Mål"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1057
+#, java-format
+msgid "Continue to {0} without saving"
+msgstr "Fortsätt till {0} utan att spara"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1062
+#, java-format
+msgid "Save {0} to router address book and continue to eepsite"
+msgstr "Spara {0} till routeradressboken och fortsätt till eepsite "
+
+#. only blockfile supports multiple books
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1065
+#, java-format
+msgid "Save {0} to master address book and continue to eepsite"
+msgstr "Spara {0} till huvudadressboken och fortsätt till eepsite "
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1066
+#, java-format
+msgid "Save {0} to private address book and continue to eepsite"
+msgstr "Spara {0} till privatadressbok och fortsätt till eepsite "
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1180
+msgid "HTTP Outproxy"
+msgstr "HTTP Utproxy"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1216
+msgid ""
+"Click a link below to look for an address helper by using a \"jump\" service:"
+msgstr ""
+"Klicka på en länk nedan för att söka efter en hjälpaddress genom att använda "
+"en \"hopp\" tjänst"
+
+#. Translators: parameter is a host name
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1224
+#, java-format
+msgid "{0} jump service"
+msgstr "{0} hopptjänst"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:163
+#, java-format
+msgid "Added via address helper from {0}"
+msgstr "Tillagd via adresshjälpare från {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:165
+msgid "Added via address helper"
+msgstr "Tillagd via adresshjälpen "
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:190
+#, java-format
+msgid "Redirecting to {0}"
+msgstr "Om dirigerar till  {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:202
+#, java-format
+msgid "Saved {0} to the {1} addressbook, redirecting now."
+msgstr "Spara {0} till {1}adressboken, omdirigerar nu "
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:203
+#, java-format
+msgid "Failed to save {0} to the {1} addressbook, redirecting now."
+msgstr "Misslyckades med att spara {0} till {1}adressboken, omdirigerar nu "
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
+msgid "Click here if you are not redirected automatically."
+msgstr "Klicka här om du inte omdirigeras automatiskt "

apps/i2ptunnel/locale-proxy/messages_uk.po

@@ -0,0 +1,451 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2ptunnel package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+#
+# Translators:
+# Denis  <gribua@gmail.com>, 2011.
+# Denis Lysenko <gribua@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P i2ptunnel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-07-13 18:50+0000\n"
+"PO-Revision-Date: 2012-02-17 12:01+0000\n"
+"Last-Translator: Denis Lysenko <gribua@gmail.com>\n"
+"Language-Team: Ukrainian (Ukraine) (http://www.transifex.net/projects/p/I2P/"
+"language/uk_UA/)\n"
+"Language: uk_UA\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: ../java/build/Proxy.java:5
+msgid "Proxy Authorization Required"
+msgstr "Авторизація outproxy"
+
+#: ../java/build/Proxy.java:6
+msgid "I2P HTTP Proxy Authorization Required"
+msgstr "Авторизація outproxy"
+
+#: ../java/build/Proxy.java:7
+msgid "This proxy is configured to require a username and password for access."
+msgstr ""
+
+#: ../java/build/Proxy.java:8
+#, java-format
+msgid ""
+"Please enter your username and password, or check your {0}router "
+"configuration{1} or {2}I2PTunnel configuration{3}."
+msgstr ""
+
+#: ../java/build/Proxy.java:9
+#, java-format
+msgid ""
+"To disable authorization, remove the configuration {0}i2ptunnel.proxy."
+"auth=basic{1}, then stop and restart the HTTP Proxy tunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:10 ../java/build/Proxy.java:16
+msgid "Warning: No Outproxy Configured"
+msgstr ""
+
+#: ../java/build/Proxy.java:11 ../java/build/Proxy.java:20
+#: ../java/build/Proxy.java:32 ../java/build/Proxy.java:44
+#: ../java/build/Proxy.java:52 ../java/build/Proxy.java:61
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:83
+#: ../java/build/Proxy.java:93 ../java/build/Proxy.java:103
+#: ../java/build/Proxy.java:115
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:196
+msgid "Router Console"
+msgstr "Консоль роутера"
+
+#: ../java/build/Proxy.java:12 ../java/build/Proxy.java:21
+#: ../java/build/Proxy.java:33 ../java/build/Proxy.java:45
+#: ../java/build/Proxy.java:53 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:75 ../java/build/Proxy.java:84
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:104
+#: ../java/build/Proxy.java:116
+msgid "I2P Router Console"
+msgstr "Консоль роутера"
+
+#: ../java/build/Proxy.java:13 ../java/build/Proxy.java:22
+#: ../java/build/Proxy.java:34 ../java/build/Proxy.java:46
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:76 ../java/build/Proxy.java:85
+#: ../java/build/Proxy.java:95 ../java/build/Proxy.java:105
+#: ../java/build/Proxy.java:117
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Configuration"
+msgstr "Настройки"
+
+#: ../java/build/Proxy.java:14 ../java/build/Proxy.java:23
+#: ../java/build/Proxy.java:35 ../java/build/Proxy.java:47
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:77 ../java/build/Proxy.java:86
+#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:106
+#: ../java/build/Proxy.java:118
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Help"
+msgstr "Допомога"
+
+#: ../java/build/Proxy.java:15 ../java/build/Proxy.java:24
+#: ../java/build/Proxy.java:36 ../java/build/Proxy.java:48
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:65
+#: ../java/build/Proxy.java:78 ../java/build/Proxy.java:87
+#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:107
+#: ../java/build/Proxy.java:119
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Addressbook"
+msgstr "Адресна книга"
+
+#: ../java/build/Proxy.java:17
+msgid ""
+"Your request was for a site outside of I2P, but you have no HTTP outproxy "
+"configured."
+msgstr ""
+
+#: ../java/build/Proxy.java:18
+msgid "Please configure an outproxy in I2PTunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:19
+msgid "Information: New Host Name"
+msgstr ""
+
+#: ../java/build/Proxy.java:25
+msgid "Information: New Host Name with Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:26
+msgid ""
+"The address helper link you followed is for a new host name that is not in "
+"your address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:27
+msgid "You may save this host name to your local address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:28
+msgid ""
+"If you save it to your address book, you will not see this message again."
+msgstr ""
+
+#: ../java/build/Proxy.java:29
+msgid ""
+"If you do not save it, the host name will be forgotten after the next router "
+"restart."
+msgstr ""
+
+#: ../java/build/Proxy.java:30
+msgid ""
+"If you do not wish to visit this host, click the \"back\" button on your "
+"browser."
+msgstr ""
+
+#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:37
+msgid "Warning: Invalid Destination"
+msgstr "Локальний адрес призначення"
+
+#: ../java/build/Proxy.java:38
+msgid ""
+"The eepsite destination specified was not valid, or was otherwise "
+"unreachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:39
+msgid ""
+"Perhaps you pasted in the wrong Base 64 string or the link you are following "
+"is bad."
+msgstr ""
+
+#: ../java/build/Proxy.java:40
+msgid "The I2P host could also be offline."
+msgstr ""
+
+#: ../java/build/Proxy.java:41 ../java/build/Proxy.java:123
+#, java-format
+msgid "You may want to {0}retry{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:42 ../java/build/Proxy.java:72
+#: ../java/build/Proxy.java:113 ../java/build/Proxy.java:124
+msgid "Could not find the following destination:"
+msgstr "Місце призначення тунелю"
+
+#: ../java/build/Proxy.java:43 ../java/build/Proxy.java:49
+msgid "Warning: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:50
+msgid "You attempted to connect to a non-I2P website or location."
+msgstr ""
+
+#: ../java/build/Proxy.java:51 ../java/build/Proxy.java:57
+msgid "Warning: Invalid Request URI"
+msgstr ""
+
+#: ../java/build/Proxy.java:58
+msgid "The request URI is invalid, and probably contains illegal characters."
+msgstr ""
+
+#: ../java/build/Proxy.java:59
+msgid ""
+"If you clicked a link, check the end of the URI for any characters the "
+"browser has mistakenly added on."
+msgstr ""
+
+#: ../java/build/Proxy.java:60
+msgid "Warning: Eepsite Unknown"
+msgstr ""
+
+#: ../java/build/Proxy.java:66
+msgid "Warning: Eepsite Not Found in Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:67
+msgid "The eepsite was not found in your router's addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:68
+msgid "Check the link or find a Base 32 or Base 64 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:69
+#, java-format
+msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:70
+msgid ""
+"Otherwise, find a Base 32 or address helper link, or use a jump service link "
+"below."
+msgstr ""
+
+#: ../java/build/Proxy.java:71
+#, java-format
+msgid ""
+"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
+"subscriptions{3} to your addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:73
+msgid "Error: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:79
+msgid "Error: Local Access"
+msgstr ""
+
+#: ../java/build/Proxy.java:80
+msgid "Your browser is misconfigured."
+msgstr ""
+
+#: ../java/build/Proxy.java:81
+msgid ""
+"Do not use the proxy to access the router console, localhost, or local LAN "
+"destinations."
+msgstr ""
+
+#: ../java/build/Proxy.java:82 ../java/build/Proxy.java:88
+msgid "Warning: Non-HTTP Protocol"
+msgstr ""
+
+#: ../java/build/Proxy.java:89
+msgid "The request uses a bad protocol."
+msgstr ""
+
+#: ../java/build/Proxy.java:90
+#, java-format
+msgid "The I2P HTTP Proxy supports {0}http://{1} requests ONLY."
+msgstr ""
+
+#: ../java/build/Proxy.java:91
+#, java-format
+msgid ""
+"Other protocols such as {0}https://{1} and {0}ftp://{1} are not allowed."
+msgstr ""
+
+#: ../java/build/Proxy.java:92 ../java/build/Proxy.java:98
+msgid "Warning: Bad Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:99
+#, java-format
+msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
+msgstr ""
+
+#: ../java/build/Proxy.java:100
+msgid "It seems to be garbage data, or a mistyped Base 32 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:101
+msgid ""
+"Check your URL to try and fix the helper key to be a valid Base 32 hostname "
+"or Base 64 key."
+msgstr ""
+
+#: ../java/build/Proxy.java:102 ../java/build/Proxy.java:108
+msgid "Warning: Outproxy Not Found"
+msgstr ""
+
+#: ../java/build/Proxy.java:109
+msgid "The HTTP Outproxy was not found."
+msgstr ""
+
+#: ../java/build/Proxy.java:110
+msgid ""
+"It is offline, there is network congestion, or your router is not yet well-"
+"integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:111
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr ""
+
+#: ../java/build/Proxy.java:112
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list {0}"
+"here{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:114 ../java/build/Proxy.java:120
+msgid "Warning: Eepsite Unreachable"
+msgstr ""
+
+#: ../java/build/Proxy.java:121
+msgid "The eepsite was not reachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:122
+msgid ""
+"The eepsite is offline, there is network congestion, or your router is not "
+"yet well-integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:126
+msgid "Warning: Destination Key Conflict"
+msgstr ""
+
+#: ../java/build/Proxy.java:127
+msgid ""
+"The addresshelper link you followed specifies a different destination key "
+"than a host entry in your host database."
+msgstr ""
+
+#: ../java/build/Proxy.java:128
+msgid ""
+"Someone could be trying to impersonate another eepsite, or people have given "
+"two eepsites identical names."
+msgstr ""
+
+#: ../java/build/Proxy.java:129
+msgid ""
+"You can resolve the conflict by considering which key you trust, and either "
+"discarding the addresshelper link, discarding the host entry from your host "
+"database, or naming one of them differently."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "This seems to be a bad destination:"
+msgstr "Скоріше всього це поганий адрес призначення:"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "i2paddresshelper cannot help you with a destination like that!"
+msgstr "i2paddresshelper не може допомогти Вам з місцем призначення як це!"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:639
+#, 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:1043
+msgid "Host"
+msgstr "Адрес"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1047
+msgid "Base 32"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1051
+msgid "Destination"
+msgstr "Адреса призначення"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1057
+#, java-format
+msgid "Continue to {0} without saving"
+msgstr "Продовжити до {0} без збереження"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1062
+#, java-format
+msgid "Save {0} to router address book and continue to eepsite"
+msgstr "Зберегти {0} в адресну книгу роутера и продовжити перехід до eep-сайту"
+
+#. only blockfile supports multiple books
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1065
+#, java-format
+msgid "Save {0} to master address book and continue to eepsite"
+msgstr "Зберегти {0} в основну адресну книгу і продовжити перехід до еер-сайту"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1066
+#, java-format
+msgid "Save {0} to private address book and continue to eepsite"
+msgstr ""
+"Зберегти {0} в приватну адресну книгу і продовжити перехід до еер-сайту."
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1180
+msgid "HTTP Outproxy"
+msgstr "Вихідний HTTP проксі"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+msgid ""
+"Click a link below to look for an address helper by using a \"jump\" service:"
+msgstr ""
+"\"Jump\" сервіси, які, можливо, знають необхідне Вам addresshelper-посилання."
+
+#. Translators: parameter is a host name
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1221
+#, java-format
+msgid "{0} jump service"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:163
+#, java-format
+msgid "Added via address helper from {0}"
+msgstr "Додано через address helper {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:165
+msgid "Added via address helper"
+msgstr "Додано через address helper"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:190
+#, java-format
+msgid "Redirecting to {0}"
+msgstr "Перенаправляємо до {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:202
+#, java-format
+msgid "Saved {0} to the {1} addressbook, redirecting now."
+msgstr "{0} збережено в {1} адресної книги, перенапрявляємо."
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:203
+#, java-format
+msgid "Failed to save {0} to the {1} addressbook, redirecting now."
+msgstr "Не вдалось зберегти {0} в {1} адресної книги, перенаправляємо."
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
+msgid "Click here if you are not redirected automatically."
+msgstr "Клацніть тут якщо вас не перенаправило автоматично."

apps/i2ptunnel/locale-proxy/messages_vi.po

@@ -0,0 +1,448 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2ptunnel package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+#
+#   <tran.nathan@gmail.com>, 2011.
+# dich_tran <tran.nathan@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P i2ptunnel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-07-13 18:50+0000\n"
+"PO-Revision-Date: 2011-06-11 08:42+0000\n"
+"Last-Translator: ducki2p <ducki2p@gmail.com>\n"
+"Language-Team: Vietnamese (http://www.transifex.net/projects/p/I2P/team/"
+"vi/)\n"
+"Language: vi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ../java/build/Proxy.java:5
+msgid "Proxy Authorization Required"
+msgstr "Cho phép Outproxy"
+
+#: ../java/build/Proxy.java:6
+msgid "I2P HTTP Proxy Authorization Required"
+msgstr "Cho phép Outproxy"
+
+#: ../java/build/Proxy.java:7
+msgid "This proxy is configured to require a username and password for access."
+msgstr ""
+
+#: ../java/build/Proxy.java:8
+#, java-format
+msgid ""
+"Please enter your username and password, or check your {0}router "
+"configuration{1} or {2}I2PTunnel configuration{3}."
+msgstr ""
+
+#: ../java/build/Proxy.java:9
+#, java-format
+msgid ""
+"To disable authorization, remove the configuration {0}i2ptunnel.proxy."
+"auth=basic{1}, then stop and restart the HTTP Proxy tunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:10 ../java/build/Proxy.java:16
+msgid "Warning: No Outproxy Configured"
+msgstr ""
+
+#: ../java/build/Proxy.java:11 ../java/build/Proxy.java:20
+#: ../java/build/Proxy.java:32 ../java/build/Proxy.java:44
+#: ../java/build/Proxy.java:52 ../java/build/Proxy.java:61
+#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:83
+#: ../java/build/Proxy.java:93 ../java/build/Proxy.java:103
+#: ../java/build/Proxy.java:115
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:196
+msgid "Router Console"
+msgstr ""
+
+#: ../java/build/Proxy.java:12 ../java/build/Proxy.java:21
+#: ../java/build/Proxy.java:33 ../java/build/Proxy.java:45
+#: ../java/build/Proxy.java:53 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:75 ../java/build/Proxy.java:84
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:104
+#: ../java/build/Proxy.java:116
+msgid "I2P Router Console"
+msgstr ""
+
+#: ../java/build/Proxy.java:13 ../java/build/Proxy.java:22
+#: ../java/build/Proxy.java:34 ../java/build/Proxy.java:46
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:76 ../java/build/Proxy.java:85
+#: ../java/build/Proxy.java:95 ../java/build/Proxy.java:105
+#: ../java/build/Proxy.java:117
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Configuration"
+msgstr ""
+
+#: ../java/build/Proxy.java:14 ../java/build/Proxy.java:23
+#: ../java/build/Proxy.java:35 ../java/build/Proxy.java:47
+#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:77 ../java/build/Proxy.java:86
+#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:106
+#: ../java/build/Proxy.java:118
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Help"
+msgstr ""
+
+#: ../java/build/Proxy.java:15 ../java/build/Proxy.java:24
+#: ../java/build/Proxy.java:36 ../java/build/Proxy.java:48
+#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:65
+#: ../java/build/Proxy.java:78 ../java/build/Proxy.java:87
+#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:107
+#: ../java/build/Proxy.java:119
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:17
+msgid ""
+"Your request was for a site outside of I2P, but you have no HTTP outproxy "
+"configured."
+msgstr ""
+
+#: ../java/build/Proxy.java:18
+msgid "Please configure an outproxy in I2PTunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:19
+msgid "Information: New Host Name"
+msgstr ""
+
+#: ../java/build/Proxy.java:25
+msgid "Information: New Host Name with Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:26
+msgid ""
+"The address helper link you followed is for a new host name that is not in "
+"your address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:27
+msgid "You may save this host name to your local address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:28
+msgid ""
+"If you save it to your address book, you will not see this message again."
+msgstr ""
+
+#: ../java/build/Proxy.java:29
+msgid ""
+"If you do not save it, the host name will be forgotten after the next router "
+"restart."
+msgstr ""
+
+#: ../java/build/Proxy.java:30
+msgid ""
+"If you do not wish to visit this host, click the \"back\" button on your "
+"browser."
+msgstr ""
+
+#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:37
+msgid "Warning: Invalid Destination"
+msgstr "Điểm đến nội bộ"
+
+#: ../java/build/Proxy.java:38
+msgid ""
+"The eepsite destination specified was not valid, or was otherwise "
+"unreachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:39
+msgid ""
+"Perhaps you pasted in the wrong Base 64 string or the link you are following "
+"is bad."
+msgstr ""
+
+#: ../java/build/Proxy.java:40
+msgid "The I2P host could also be offline."
+msgstr ""
+
+#: ../java/build/Proxy.java:41 ../java/build/Proxy.java:123
+#, java-format
+msgid "You may want to {0}retry{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:42 ../java/build/Proxy.java:72
+#: ../java/build/Proxy.java:113 ../java/build/Proxy.java:124
+msgid "Could not find the following destination:"
+msgstr "tên hay điểm đến"
+
+#: ../java/build/Proxy.java:43 ../java/build/Proxy.java:49
+msgid "Warning: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:50
+msgid "You attempted to connect to a non-I2P website or location."
+msgstr ""
+
+#: ../java/build/Proxy.java:51 ../java/build/Proxy.java:57
+msgid "Warning: Invalid Request URI"
+msgstr ""
+
+#: ../java/build/Proxy.java:58
+msgid "The request URI is invalid, and probably contains illegal characters."
+msgstr ""
+
+#: ../java/build/Proxy.java:59
+msgid ""
+"If you clicked a link, check the end of the URI for any characters the "
+"browser has mistakenly added on."
+msgstr ""
+
+#: ../java/build/Proxy.java:60
+msgid "Warning: Eepsite Unknown"
+msgstr ""
+
+#: ../java/build/Proxy.java:66
+msgid "Warning: Eepsite Not Found in Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:67
+msgid "The eepsite was not found in your router's addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:68
+msgid "Check the link or find a Base 32 or Base 64 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:69
+#, java-format
+msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:70
+msgid ""
+"Otherwise, find a Base 32 or address helper link, or use a jump service link "
+"below."
+msgstr ""
+
+#: ../java/build/Proxy.java:71
+#, java-format
+msgid ""
+"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
+"subscriptions{3} to your addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:73
+msgid "Error: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:79
+msgid "Error: Local Access"
+msgstr ""
+
+#: ../java/build/Proxy.java:80
+msgid "Your browser is misconfigured."
+msgstr ""
+
+#: ../java/build/Proxy.java:81
+msgid ""
+"Do not use the proxy to access the router console, localhost, or local LAN "
+"destinations."
+msgstr ""
+
+#: ../java/build/Proxy.java:82 ../java/build/Proxy.java:88
+msgid "Warning: Non-HTTP Protocol"
+msgstr ""
+
+#: ../java/build/Proxy.java:89
+msgid "The request uses a bad protocol."
+msgstr ""
+
+#: ../java/build/Proxy.java:90
+#, java-format
+msgid "The I2P HTTP Proxy supports {0}http://{1} requests ONLY."
+msgstr ""
+
+#: ../java/build/Proxy.java:91
+#, java-format
+msgid ""
+"Other protocols such as {0}https://{1} and {0}ftp://{1} are not allowed."
+msgstr ""
+
+#: ../java/build/Proxy.java:92 ../java/build/Proxy.java:98
+msgid "Warning: Bad Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:99
+#, java-format
+msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
+msgstr ""
+
+#: ../java/build/Proxy.java:100
+msgid "It seems to be garbage data, or a mistyped Base 32 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:101
+msgid ""
+"Check your URL to try and fix the helper key to be a valid Base 32 hostname "
+"or Base 64 key."
+msgstr ""
+
+#: ../java/build/Proxy.java:102 ../java/build/Proxy.java:108
+msgid "Warning: Outproxy Not Found"
+msgstr ""
+
+#: ../java/build/Proxy.java:109
+msgid "The HTTP Outproxy was not found."
+msgstr ""
+
+#: ../java/build/Proxy.java:110
+msgid ""
+"It is offline, there is network congestion, or your router is not yet well-"
+"integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:111
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr ""
+
+#: ../java/build/Proxy.java:112
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list {0}"
+"here{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:114 ../java/build/Proxy.java:120
+msgid "Warning: Eepsite Unreachable"
+msgstr ""
+
+#: ../java/build/Proxy.java:121
+msgid "The eepsite was not reachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:122
+msgid ""
+"The eepsite is offline, there is network congestion, or your router is not "
+"yet well-integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:126
+msgid "Warning: Destination Key Conflict"
+msgstr ""
+
+#: ../java/build/Proxy.java:127
+msgid ""
+"The addresshelper link you followed specifies a different destination key "
+"than a host entry in your host database."
+msgstr ""
+
+#: ../java/build/Proxy.java:128
+msgid ""
+"Someone could be trying to impersonate another eepsite, or people have given "
+"two eepsites identical names."
+msgstr ""
+
+#: ../java/build/Proxy.java:129
+msgid ""
+"You can resolve the conflict by considering which key you trust, and either "
+"discarding the addresshelper link, discarding the host entry from your host "
+"database, or naming one of them differently."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "This seems to be a bad destination:"
+msgstr "tên hay điểm đến"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "i2paddresshelper cannot help you with a destination like that!"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:639
+#, 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 ""
+"Để truy cập vào điểm đến trong cơ sở dữ liệu máy chủ, bấm <a href="
+"\"{0}\">vào đây</a>. Để truy cập vào địa chỉ giúp đỡ xung đột, bấm <a href="
+"\"{1}\">vào đây</a>."
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1043
+msgid "Host"
+msgstr "Máy chủ"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1047
+msgid "Base 32"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1051
+msgid "Destination"
+msgstr "Đích đến"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1057
+#, java-format
+msgid "Continue to {0} without saving"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1062
+#, java-format
+msgid "Save {0} to router address book and continue to eepsite"
+msgstr ""
+
+#. only blockfile supports multiple books
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1065
+#, java-format
+msgid "Save {0} to master address book and continue to eepsite"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1066
+#, java-format
+msgid "Save {0} to private address book and continue to eepsite"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1180
+msgid "HTTP Outproxy"
+msgstr "Outproxy"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
+msgid ""
+"Click a link below to look for an address helper by using a \"jump\" service:"
+msgstr ""
+"Bấm vào đường dẫn dưới đây để tìm địa chỉ giúp đỡ bằng dịch vụ \"nhảy\":"
+
+#. Translators: parameter is a host name
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1221
+#, java-format
+msgid "{0} jump service"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:163
+#, java-format
+msgid "Added via address helper from {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:165
+msgid "Added via address helper"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:190
+#, java-format
+msgid "Redirecting to {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:202
+#, java-format
+msgid "Saved {0} to the {1} addressbook, redirecting now."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:203
+#, java-format
+msgid "Failed to save {0} to the {1} addressbook, redirecting now."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
+msgid "Click here if you are not redirected automatically."
+msgstr ""

apps/i2ptunnel/locale-proxy/messages_zh.po

@@ -0,0 +1,449 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2ptunnel package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+#
+# ducki2p <ducki2p@gmail.com>, 2011.
+#   <walking@i2pmail.org>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P i2ptunnel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-08-11 14:28+0000\n"
+"PO-Revision-Date: 2011-08-20 06:00+0000\n"
+"Last-Translator: walking <walking@i2pmail.org>\n"
+"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/I2P/team/"
+"zh_CN/)\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ../java/build/Proxy.java:5 ../java/build/Proxy.java:11
+msgid "Warning: Outproxy Not Found"
+msgstr ""
+
+#: ../java/build/Proxy.java:6 ../java/build/Proxy.java:18
+#: ../java/build/Proxy.java:27 ../java/build/Proxy.java:40
+#: ../java/build/Proxy.java:49 ../java/build/Proxy.java:61
+#: ../java/build/Proxy.java:69 ../java/build/Proxy.java:88
+#: ../java/build/Proxy.java:99 ../java/build/Proxy.java:111
+#: ../java/build/Proxy.java:121
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:196
+msgid "Router Console"
+msgstr "路由控制台"
+
+#: ../java/build/Proxy.java:7 ../java/build/Proxy.java:19
+#: ../java/build/Proxy.java:28 ../java/build/Proxy.java:41
+#: ../java/build/Proxy.java:50 ../java/build/Proxy.java:62
+#: ../java/build/Proxy.java:70 ../java/build/Proxy.java:89
+#: ../java/build/Proxy.java:100 ../java/build/Proxy.java:112
+#: ../java/build/Proxy.java:122
+msgid "I2P Router Console"
+msgstr "路由控制台"
+
+#: ../java/build/Proxy.java:8 ../java/build/Proxy.java:20
+#: ../java/build/Proxy.java:29 ../java/build/Proxy.java:42
+#: ../java/build/Proxy.java:51 ../java/build/Proxy.java:63
+#: ../java/build/Proxy.java:71 ../java/build/Proxy.java:90
+#: ../java/build/Proxy.java:101 ../java/build/Proxy.java:113
+#: ../java/build/Proxy.java:123
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Configuration"
+msgstr "配置"
+
+#: ../java/build/Proxy.java:9 ../java/build/Proxy.java:21
+#: ../java/build/Proxy.java:30 ../java/build/Proxy.java:43
+#: ../java/build/Proxy.java:52 ../java/build/Proxy.java:64
+#: ../java/build/Proxy.java:72 ../java/build/Proxy.java:91
+#: ../java/build/Proxy.java:102 ../java/build/Proxy.java:114
+#: ../java/build/Proxy.java:124
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Help"
+msgstr "帮助"
+
+#: ../java/build/Proxy.java:10 ../java/build/Proxy.java:22
+#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:44
+#: ../java/build/Proxy.java:53 ../java/build/Proxy.java:65
+#: ../java/build/Proxy.java:73 ../java/build/Proxy.java:92
+#: ../java/build/Proxy.java:103 ../java/build/Proxy.java:115
+#: ../java/build/Proxy.java:125
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
+msgid "Addressbook"
+msgstr "地址簿"
+
+#: ../java/build/Proxy.java:12
+msgid "The HTTP Outproxy was not found."
+msgstr "HTTP代理未启动"
+
+#: ../java/build/Proxy.java:13
+msgid ""
+"It is offline, there is network congestion, or your router is not yet well-"
+"integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:14
+#, java-format
+msgid ""
+"You may want to {0}retry{1} as this will randomly reselect an outproxy from "
+"the pool you have defined {2}here{3} (if you have more than one configured)."
+msgstr ""
+
+#: ../java/build/Proxy.java:15
+#, java-format
+msgid ""
+"If you continue to have trouble you may want to edit your outproxy list {0}"
+"here{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:16 ../java/build/Proxy.java:38
+#: ../java/build/Proxy.java:59 ../java/build/Proxy.java:97
+msgid "Could not find the following destination:"
+msgstr "隧道目标"
+
+#: ../java/build/Proxy.java:17
+msgid "Error: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:23
+msgid "Error: Local Access"
+msgstr ""
+
+#: ../java/build/Proxy.java:24
+msgid "Your browser is misconfigured."
+msgstr "您的浏览器不支持iFrame。"
+
+#: ../java/build/Proxy.java:25
+msgid ""
+"Do not use the proxy to access the router console, localhost, or local LAN "
+"destinations."
+msgstr ""
+
+#: ../java/build/Proxy.java:26
+msgid "Warning: Eepsite Unknown"
+msgstr ""
+
+#: ../java/build/Proxy.java:32
+msgid "Warning: Eepsite Not Found in Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:33
+msgid "The eepsite was not found in your router's addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:34
+msgid "Check the link or find a Base 32 or Base 64 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:35
+#, java-format
+msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:36
+msgid ""
+"Otherwise, find a Base 32 or address helper link, or use a jump service link "
+"below."
+msgstr ""
+
+#: ../java/build/Proxy.java:37
+#, java-format
+msgid ""
+"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some "
+"subscriptions{3} to your addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:39 ../java/build/Proxy.java:45
+msgid "Warning: Invalid Request URI"
+msgstr ""
+
+#: ../java/build/Proxy.java:46
+msgid "The request URI is invalid, and probably contains illegal characters."
+msgstr ""
+
+#: ../java/build/Proxy.java:47
+msgid ""
+"If you clicked a link, check the end of the URI for any characters the "
+"browser has mistakenly added on."
+msgstr ""
+
+#: ../java/build/Proxy.java:48 ../java/build/Proxy.java:54
+msgid "Warning: Invalid Destination"
+msgstr "本地目标"
+
+#: ../java/build/Proxy.java:55
+msgid ""
+"The eepsite destination specified was not valid, or was otherwise "
+"unreachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:56
+msgid ""
+"Perhaps you pasted in the wrong Base 64 string or the link you are following "
+"is bad."
+msgstr ""
+
+#: ../java/build/Proxy.java:57
+msgid "The I2P host could also be offline."
+msgstr ""
+
+#: ../java/build/Proxy.java:58 ../java/build/Proxy.java:96
+#, java-format
+msgid "You may want to {0}retry{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:60 ../java/build/Proxy.java:66
+msgid "Warning: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:67
+msgid "You attempted to connect to a non-I2P website or location."
+msgstr ""
+
+#: ../java/build/Proxy.java:68 ../java/build/Proxy.java:74
+msgid "Warning: No Outproxy Configured"
+msgstr ""
+
+#: ../java/build/Proxy.java:75
+msgid ""
+"Your request was for a site outside of I2P, but you have no HTTP outproxy "
+"configured."
+msgstr ""
+
+#: ../java/build/Proxy.java:76
+msgid "Please configure an outproxy in I2PTunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:77 ../java/build/Proxy.java:78
+msgid "Warning: Destination Key Conflict"
+msgstr ""
+
+#: ../java/build/Proxy.java:79
+msgid ""
+"The addresshelper link you followed specifies a different destination key "
+"than a host entry in your host database."
+msgstr ""
+
+#: ../java/build/Proxy.java:80
+msgid ""
+"Someone could be trying to impersonate another eepsite, or people have given "
+"two eepsites identical names."
+msgstr ""
+
+#: ../java/build/Proxy.java:81
+msgid ""
+"You can resolve the conflict by considering which key you trust, and either "
+"discarding the addresshelper link, discarding the host entry from your host "
+"database, or naming one of them differently."
+msgstr ""
+
+#: ../java/build/Proxy.java:82
+msgid "Proxy Authorization Required"
+msgstr "出口代理认证"
+
+#: ../java/build/Proxy.java:83
+msgid "I2P HTTP Proxy Authorization Required"
+msgstr "出口代理认证"
+
+#: ../java/build/Proxy.java:84
+msgid "This proxy is configured to require a username and password for access."
+msgstr ""
+
+#: ../java/build/Proxy.java:85
+#, java-format
+msgid ""
+"Please enter your username and password, or check your {0}router "
+"configuration{1} or {2}I2PTunnel configuration{3}."
+msgstr ""
+
+#: ../java/build/Proxy.java:86
+#, java-format
+msgid ""
+"To disable authorization, remove the configuration {0}i2ptunnel.proxy."
+"auth=basic{1}, then stop and restart the HTTP Proxy tunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:93
+msgid "Warning: Eepsite Unreachable"
+msgstr ""
+
+#: ../java/build/Proxy.java:94
+msgid "The eepsite was not reachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:95
+msgid ""
+"The eepsite is offline, there is network congestion, or your router is not "
+"yet well-integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:98
+msgid "Information: New Host Name"
+msgstr ""
+
+#: ../java/build/Proxy.java:104
+msgid "Information: New Host Name with Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:105
+msgid ""
+"The address helper link you followed is for a new host name that is not in "
+"your address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:106
+msgid "You may save this host name to your local address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:107
+msgid ""
+"If you save it to your address book, you will not see this message again."
+msgstr ""
+
+#: ../java/build/Proxy.java:108
+msgid ""
+"If you do not save it, the host name will be forgotten after the next router "
+"restart."
+msgstr ""
+
+#: ../java/build/Proxy.java:109
+msgid ""
+"If you do not wish to visit this host, click the \"back\" button on your "
+"browser."
+msgstr ""
+
+#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:116
+msgid "Warning: Bad Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:117
+#, java-format
+msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
+msgstr ""
+
+#: ../java/build/Proxy.java:118
+msgid "It seems to be garbage data, or a mistyped Base 32 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:119
+msgid ""
+"Check your URL to try and fix the helper key to be a valid Base 32 hostname "
+"or Base 64 key."
+msgstr ""
+
+#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:126
+msgid "Warning: Non-HTTP Protocol"
+msgstr ""
+
+#: ../java/build/Proxy.java:127
+msgid "The request uses a bad protocol."
+msgstr ""
+
+#: ../java/build/Proxy.java:128
+#, java-format
+msgid "The I2P HTTP Proxy supports {0}http://{1} requests ONLY."
+msgstr ""
+
+#: ../java/build/Proxy.java:129
+#, java-format
+msgid ""
+"Other protocols such as {0}https://{1} and {0}ftp://{1} are not allowed."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "This seems to be a bad destination:"
+msgstr "隧道目标"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
+msgid "i2paddresshelper cannot help you with a destination like that!"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:639
+#, 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 ""
+"域名冲突：要访问您本地【地址簿】中设置的目标主机(相当与IP)，请点击<a href="
+"\"{0}\">这里</a>。要访问【地址助手】返回的目标主机请点<a href=\"{1}\">这里</"
+"a>。"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1043
+msgid "Host"
+msgstr "主机"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1047
+msgid "Base 32"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1051
+msgid "Destination"
+msgstr "目标"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1057
+#, java-format
+msgid "Continue to {0} without saving"
+msgstr "继续{0}，而不保存"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1062
+#, java-format
+msgid "Save {0} to router address book and continue to eepsite"
+msgstr "保存{0}至“路由器地址簿”并访问该eepsite。"
+
+#. only blockfile supports multiple books
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1065
+#, java-format
+msgid "Save {0} to master address book and continue to eepsite"
+msgstr "保存{0}至“主地址簿”并访问该eepsite。"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1066
+#, java-format
+msgid "Save {0} to private address book and continue to eepsite"
+msgstr "保存{0}至“私有地址簿”并访问该eepsite。"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1180
+msgid "HTTP Outproxy"
+msgstr "出口代理"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1216
+msgid ""
+"Click a link below to look for an address helper by using a \"jump\" service:"
+msgstr ""
+"请点击下面的链接通过【跳转(Jump)】服务提供的【地址助手】链接跳转至域名对应的"
+"主机："
+
+#. Translators: parameter is a host name
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1224
+#, java-format
+msgid "{0} jump service"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:163
+#, java-format
+msgid "Added via address helper from {0}"
+msgstr "已通过地址助手添加 {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:165
+msgid "Added via address helper"
+msgstr "已通过地址助手添加"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:190
+#, java-format
+msgid "Redirecting to {0}"
+msgstr "正在重定向至{0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:202
+#, java-format
+msgid "Saved {0} to the {1} addressbook, redirecting now."
+msgstr "目标{0}已保存至{1}地址簿中，正在重定向至此目标。"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:203
+#, java-format
+msgid "Failed to save {0} to the {1} addressbook, redirecting now."
+msgstr "目标{0}在{1}地址簿中保存失败，，正在重定向至此目标。"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
+msgid "Click here if you are not redirected automatically."
+msgstr "如果未能自动重定向，请点击这里。"

apps/i2ptunnel/locale/messages_ar.po

@@ -12,7 +12,7 @@ msgstr ""
 "PO-Revision-Date: 2011-03-03 17:02-0000\n"
 "Last-Translator: hamada <hamada@mail.i2p>\n"
 "Language-Team: duck <duck@mail.i2p>\n"
-"Language: \n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

apps/i2ptunnel/locale/messages_de.po

@@ -6,20 +6,21 @@
 # Translators:
 # blabla, 2011
 # blabla <blabla@trash-mail.com>, 2011-2012
-# D.A. Loader <>, 2012
+# D.A. Loader, 2012
 # driz <driz@i2pmail.org>, 2012
 # ducki2p <ducki2p@gmail.com>, 2011
 # foo <foo@bar>, 2009
 # mixxy, 2011
+# nextloop <ga25day@mytum.de>, 2013
 # pirr <pirr@tormail.org>, 2012
 # zeroflag <zeroflag@i2pmail.org>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-15 22:00+0000\n"
-"PO-Revision-Date: 2013-05-08 13:15+0000\n"
-"Last-Translator: zeroflag <zeroflag@i2pmail.org>\n"
+"POT-Creation-Date: 2013-09-26 21:33+0000\n"
+"PO-Revision-Date: 2013-09-23 22:32+0000\n"
+"Last-Translator: nextloop <ga25day@mytum.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/I2P/language/"
 "de/)\n"
 "Language: de\n"
@@ -28,131 +29,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:571
-msgid "This seems to be a bad destination:"
-msgstr "Dies scheint kein gültiges Ziel zu sein:"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:571
-msgid "i2paddresshelper cannot help you with a destination like that!"
-msgstr "Der I2P-Adresshelfer kann dir bei solch einem Ziel nicht helfen."
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:638
-#, 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>, und um das Ziel aus der kollidierenden Adresshelfer-"
-"Anfrage zu besuchen, <a href=\"{1}\">hier</a>!"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1042
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:426
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:410
-msgid "Host"
-msgstr "Host"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1046
-msgid "Base 32"
-msgstr "Base 32"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1050
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:376
-msgid "Destination"
-msgstr "Ziel"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1056
-#, java-format
-msgid "Continue to {0} without saving"
-msgstr "Weiter zu {0}, ohne zu speichern"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1061
-#, java-format
-msgid "Save {0} to router address book and continue to eepsite"
-msgstr "{0} im Router-Adressbuch speichern und auf die Eepseite weiterleiten"
-
-#. only blockfile supports multiple books
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1064
-#, java-format
-msgid "Save {0} to master address book and continue to eepsite"
-msgstr "{0} im Master-Adressbuch speichern und auf die Eepseite weiterleiten"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1065
-#, java-format
-msgid "Save {0} to private address book and continue to eepsite"
-msgstr "{0} im privaten Adressbuch speichern und auf die Eepseite weiterleiten"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1179
-msgid "HTTP Outproxy"
-msgstr "HTTP-Outproxy"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
-msgid ""
-"Click a link below to look for an address helper by using a \"jump\" service:"
-msgstr ""
-"Durch Klicken auf einen der untenstehenden Links bekommen Sie einen "
-"Adresshelfer von einem \"Sprung\"-Service:"
-
-#. Translators: parameter is a host name
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1220
-#, java-format
-msgid "{0} jump service"
-msgstr "Weiterleitungsdienst {0}"
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:163
-#, java-format
-msgid "Added via address helper from {0}"
-msgstr "Hinzugefüg über den Adressenhelfer von {0}"
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:165
-msgid "Added via address helper"
-msgstr "Durch Adresshelfer hinzugefügt"
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:190
-#, java-format
-msgid "Redirecting to {0}"
-msgstr "Weiterleitung zu {0}"
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:196
-msgid "Router Console"
-msgstr "Routerkonsole"
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
-msgid "Addressbook"
-msgstr "Adressbuch"
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
-msgid "Configuration"
-msgstr "Einstellungen"
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
-msgid "Help"
-msgstr "Hilfe"
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:202
-#, java-format
-msgid "Saved {0} to the {1} addressbook, redirecting now."
-msgstr ""
-"{0} wurde ins {1} Adressbuch geschrieben.  Du wirst nun weitergeleitet."
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:203
-#, java-format
-msgid "Failed to save {0} to the {1} addressbook, redirecting now."
-msgstr ""
-"Konnte {0} nicht im {1} Adressbuch speichern. Du wirst nun weitergeleitet."
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
-msgid "Click here if you are not redirected automatically."
-msgstr "Klick hier, wenn du nicht automatisch weitergeleitet wirst!"
-
 #: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:325
 #: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:335
 msgid "internal"
 msgstr "intern"
 
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:404
+#, java-format
+msgid "{0} inbound, {0} outbound tunnel"
+msgid_plural "{0} inbound, {0} outbound tunnels"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:408
+msgid "lower bandwidth and reliability"
+msgstr "niedrigere Bandbreite und Zuverlässlichkeit"
+
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:410
+msgid "standard bandwidth and reliability"
+msgstr "standard Bandbreite und Zuverlässlichkeit"
+
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:412
+msgid "higher bandwidth and reliability"
+msgstr "hohe Bandbreite und Zuverlässlichkeit"
+
 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:119
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr ""
@@ -265,7 +165,7 @@ msgid "HTTP bidir"
 msgstr "HTTP Bidir"
 
 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:603
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:302
 msgid "Host not set"
 msgstr "Host nicht gesetzt"
 
@@ -289,23 +189,23 @@ msgstr "Neue Proxyeinstellungen"
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:129
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:140
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:259
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:260
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:326
 msgid "Name"
 msgstr "Name"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:133
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:263
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:290
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:264
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:291
 msgid "Type"
 msgstr "Typ"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:243
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:244
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:402
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:330
 msgid "Description"
 msgstr "Beschreibung"
@@ -478,208 +378,188 @@ msgstr "Hops Varianz"
 msgid "Count"
 msgstr "Anzahl"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:331
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
-msgid "1 inbound, 1 outbound tunnel  (low bandwidth usage, less reliability)"
-msgstr ""
-"1 eingehender, 1 ausgehender Tunnel (geringe Bandbreitennutzung, weniger "
-"zuverlässig)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:335
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:345
-msgid ""
-"2 inbound, 2 outbound tunnels (standard bandwidth usage, standard "
-"reliability)"
-msgstr ""
-"2 eingehende, 2 ausgehende Tunnel (Standardbandbreitennutzung, zuverlässig)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:339
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:349
-msgid ""
-"3 inbound, 3 outbound tunnels (higher bandwidth usage, higher reliability)"
-msgstr ""
-"3 eingehende, 3 ausgehende Tunnel (hohe Bandbreitennutzung, zuverlässiger)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:348
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370
-msgid "tunnels"
-msgstr "Tunnel"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:353
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:338
 msgid "Backup Count"
 msgstr "Anzahl an Ersatztunneln"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:360
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:345
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr "0 Ersatztunnel (0 Redundanz, keine zusätzliche Ressourcennutzung)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:364
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:339
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:349
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr ""
 "1 Ersatztunnel in jede Richtung (geringe Redundanz, geringe "
 "Ressourcennutzung)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:390
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:353
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr ""
 "2 Ersatztunnel in jede Richtung (mittlere Redundanz, mittlere "
 "Ressourcennutzung)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:394
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:347
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:357
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr ""
 "3 Ersatztunnel in jede Richtung (hohe Redundanz, hohe Ressourcennutzung)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:402
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:355
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:365
 msgid "backup tunnels"
 msgstr "Ersatztunnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:387
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:372
 msgid "Profile"
 msgstr "Profil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:369
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:379
 msgid "interactive connection"
 msgstr "Interaktive Verbindung"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:373
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:383
 msgid "bulk connection (downloads/websites/BT)"
 msgstr "Mengenverbindung (Download/Webseiten/BitTorrent)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:375
 msgid "Delay Connect"
 msgstr "Verbindung verzögern"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:379
 msgid "for request/response connections"
 msgstr "für Verbindungen mit Anfragen/Antworten"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:383
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:387
 msgid "Router I2CP Address"
 msgstr "I2CP-Adresse des Routers"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:389
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:410
+msgid "Host"
+msgstr "Host"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:261
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:262
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:284
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:431
 msgid "Port"
 msgstr "Port"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:403
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Reduce tunnel quantity when idle"
 msgstr "Anzahl an Tunneln im Leerlauf reduzieren"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:444
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:503
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:506
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:419
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:439
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:407
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Enable"
 msgstr "aktiviert"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:510
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Reduced tunnel count"
 msgstr "Reduzierte Tunnelanzahl"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:458
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:514
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Idle minutes"
 msgstr "Minuten Inaktivität"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:417
 msgid "Close tunnels when idle"
 msgstr "nicht genutzte Tunnel schließen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:423
 msgid "New Keys on Reopen"
 msgstr "Neue Schlüssel beim Wiederöffnen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:423
 msgid "Disable"
 msgstr "deaktiviert"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "Delay tunnel open until required"
 msgstr "Aufbau des Tunnela verzögern, bis dieser benötigt wird"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:447
 msgid "Persistent private key"
 msgstr "Dauerhafter privater Schlüssel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:453
 msgid "File"
 msgstr "Datei"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:457
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
 msgid "Local destination"
 msgstr "lokales Ziel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:486
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
 msgid "(if known)"
 msgstr "(falls bekannt)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:466
 msgid "Local Authorization"
 msgstr "lokale Autorisation"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:482
 msgid "Username"
 msgstr "Benutzername"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:486
 msgid "Password"
 msgstr "Passwort"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:476
 msgid "Outproxy Authorization"
 msgstr "Outproxy Autorisation"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
 msgid "Jump URL List"
 msgstr "List der Sprung-URLs"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Custom options"
 msgstr "Eigene Optionen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:528
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:554
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:699
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:532
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:534
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:560
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:509
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:523
 msgid "Save"
 msgstr "Speichern"
 
@@ -715,116 +595,104 @@ msgstr "zum lokalen Adressbuch hinzufügen"
 msgid "Hostname Signature"
 msgstr "Signatur des Namens"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:353
-msgid "4 in, 4 out (high traffic server)"
-msgstr "4 eingehend, 4 ausgehend (Server mit großem Datenverkehr)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:357
-msgid "5 in, 5 out (high traffic server)"
-msgstr "5 eingehend, 5 ausgehend (Server mit großem Datenverkehr)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:361
-msgid "6 in, 6 out (high traffic server)"
-msgstr "6 eingehend, 6 ausgehend (Server mit großem Datenverkehr)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:405
 msgid "Encrypt Leaseset"
 msgstr "Leaseset verschlüsseln"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "Encryption Key"
 msgstr "Schlüssel zum verschlüsseln"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:415
 msgid "Generate New Key"
 msgstr "Erzeuge neuen Schlüssel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:417
 msgid "Generate"
 msgstr "Erzeugen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:456
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:419
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
 msgid "(Tunnel must be stopped first)"
 msgstr "(Tunnel muss zuerst beendet sein)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:421
 msgid "Restricted Access List"
 msgstr "Zugang beschränken"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:427
 msgid "Whitelist"
 msgstr "Zugangsliste"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:431
 msgid "Blacklist"
 msgstr "Sperrliste"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
 msgid "Access List"
 msgstr "Zugangsliste"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:439
 msgid "Inbound connection limits (0=unlimited)"
 msgstr "Begrenzung eingehender Verbindungen (0=unbegrenzt)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:441
 msgid "Per client"
 msgstr "pro Klient"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
 msgid "Per minute"
 msgstr "pro Minute"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:484
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:447
 msgid "Per hour"
 msgstr "pro Stunde"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Per day"
 msgstr "pro Tag"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:492
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455
 msgid "Total"
 msgstr "Gesamt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Max concurrent connections (0=unlimited)"
 msgstr "max. Anzahl gleichzeitiger Verbindungen (0=unbegrenzt)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "New Certificate type"
 msgstr "Neuer Zertifizierungstyp"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:483
 msgid "None"
 msgstr "Keiner"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:524
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:487
 msgid "Hashcash (effort)"
 msgstr "Hashcash (Durchsatz)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:530
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:493
 msgid "Hashcash Calc Time"
 msgstr "Hashcash Berechnungszeit"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:495
 msgid "Estimate"
 msgstr "Abschätzung"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:534
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:538
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
 msgid "Signed (signed by)"
 msgstr "Signiert (unterschrieben von)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:507
 msgid "Modify Certificate"
 msgstr "Zertifikat modifizieren"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:546
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Modify"
 msgstr "Modifizieren"
 
@@ -861,65 +729,65 @@ msgid "I2P Server Tunnels"
 msgstr "I2P-Servertunnel"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:148
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:149
 msgid "Points at"
 msgstr "Läuft auf"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:170
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:174
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:171
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:175
 msgid "Preview"
 msgstr "Vorschau"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:132
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:194
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:195
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:268
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:309
 msgid "Status"
 msgstr "Status"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:181
 msgid "Base32 Address"
 msgstr "Basis-32-Adresse"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:188
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:189
 msgid "No Preview"
 msgstr "Keine Vorschau"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:201
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:202
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:316
 msgid "Starting..."
 msgstr "Starte ..."
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:208
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:322
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:336
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:209
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:223
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:351
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:215
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:216
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:344
 msgid "Running"
 msgstr "Aktiv"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:229
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:357
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:358
 msgid "Stopped"
 msgstr "Gestoppt"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:236
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:364
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:365
 msgid "Start"
 msgstr "Start"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:251
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:252
 msgid "New server tunnel"
 msgstr "Neuer Servertunnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:253
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:411
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:254
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:412
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:223
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:265
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:295
@@ -928,33 +796,37 @@ msgstr "Neuer Servertunnel"
 msgid "Standard"
 msgstr "Standard"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:255
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:256
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:414
 msgid "Create"
 msgstr "Erstellen"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:258
 msgid "I2P Client Tunnels"
 msgstr "I2P-Klienten-Tunnel"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:295
 msgid "Interface"
 msgstr "Interface"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:329
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:330
 msgid "Standby"
 msgstr "Wartestellung"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:373
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:374
 msgid "Outproxy"
 msgstr "Ausgehender Proxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:396
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:377
+msgid "Destination"
+msgstr "Ziel"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:397
 msgid "none"
 msgstr "Keiner"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:410
 msgid "New client tunnel"
 msgstr "Neuer Kliententunnel"
 

apps/i2ptunnel/locale/messages_en.po

@@ -8,134 +8,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P i2ptunnel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-15 21:57+0000\n"
+"POT-Creation-Date: 2013-08-11 14:23+0000\n"
 "PO-Revision-Date: 2010-06-15 14:09+0100\n"
 "Last-Translator: duck <duck@mail.i2p>\n"
 "Language-Team: duck <duck@mail.i2p>\n"
-"Language: \n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:571
-msgid "This seems to be a bad destination:"
-msgstr ""
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:571
-msgid "i2paddresshelper cannot help you with a destination like that!"
-msgstr ""
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:638
-#, 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 ""
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1042
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:426
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:410
-msgid "Host"
-msgstr ""
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1046
-msgid "Base 32"
-msgstr ""
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1050
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:376
-msgid "Destination"
-msgstr ""
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1056
-#, java-format
-msgid "Continue to {0} without saving"
-msgstr ""
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1061
-#, java-format
-msgid "Save {0} to router address book and continue to eepsite"
-msgstr ""
-
-#. only blockfile supports multiple books
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1064
-#, java-format
-msgid "Save {0} to master address book and continue to eepsite"
-msgstr ""
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1065
-#, java-format
-msgid "Save {0} to private address book and continue to eepsite"
-msgstr ""
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1179
-msgid "HTTP Outproxy"
-msgstr ""
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
-msgid ""
-"Click a link below to look for an address helper by using a \"jump\" service:"
-msgstr ""
-
-#. Translators: parameter is a host name
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1220
-#, java-format
-msgid "{0} jump service"
-msgstr ""
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:163
-#, java-format
-msgid "Added via address helper from {0}"
-msgstr ""
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:165
-msgid "Added via address helper"
-msgstr ""
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:190
-#, java-format
-msgid "Redirecting to {0}"
-msgstr ""
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:196
-msgid "Router Console"
-msgstr ""
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
-msgid "Addressbook"
-msgstr ""
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
-msgid "Configuration"
-msgstr ""
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
-msgid "Help"
-msgstr ""
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:202
-#, java-format
-msgid "Saved {0} to the {1} addressbook, redirecting now."
-msgstr ""
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:203
-#, java-format
-msgid "Failed to save {0} to the {1} addressbook, redirecting now."
-msgstr ""
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
-msgid "Click here if you are not redirected automatically."
-msgstr ""
-
 #: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:325
 #: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:335
 msgid "internal"
 msgstr ""
 
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:404
+#, java-format
+msgid "{0} inbound, {0} outbound tunnel"
+msgid_plural "{0} inbound, {0} outbound tunnels"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:408
+msgid "lower bandwidth and reliability"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:410
+msgid "standard bandwidth and reliability"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:412
+msgid "higher bandwidth and reliability"
+msgstr ""
+
 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:119
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr ""
@@ -242,7 +148,7 @@ msgid "HTTP bidir"
 msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:603
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:301
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:302
 msgid "Host not set"
 msgstr ""
 
@@ -266,23 +172,23 @@ msgstr ""
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:129
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:140
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:259
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:260
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:326
 msgid "Name"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:133
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:133
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:263
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:290
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:264
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:291
 msgid "Type"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:243
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:401
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:244
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:402
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:330
 msgid "Description"
 msgstr ""
@@ -448,199 +354,183 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:331
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
-msgid "1 inbound, 1 outbound tunnel  (low bandwidth usage, less reliability)"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:338
+msgid "Backup Count"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:335
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:345
-msgid ""
-"2 inbound, 2 outbound tunnels (standard bandwidth usage, standard "
-"reliability)"
+msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:339
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:349
-msgid ""
-"3 inbound, 3 outbound tunnels (higher bandwidth usage, higher reliability)"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:348
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370
-msgid "tunnels"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:353
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
-msgid "Backup Count"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:360
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:382
-msgid "0 backup tunnels (0 redundancy, no added resource usage)"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:364
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:386
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:390
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:353
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:394
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:347
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:357
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:402
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:355
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:365
 msgid "backup tunnels"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:387
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:372
 msgid "Profile"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:369
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:379
 msgid "interactive connection"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:373
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:383
 msgid "bulk connection (downloads/websites/BT)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:375
 msgid "Delay Connect"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:379
 msgid "for request/response connections"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:383
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:387
 msgid "Router I2CP Address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:389
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:410
+msgid "Host"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:261
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:283
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:397
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:262
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:284
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:431
 msgid "Port"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:403
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Reduce tunnel quantity when idle"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:444
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:503
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:506
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:419
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:439
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:407
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Enable"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:510
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Reduced tunnel count"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:458
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:514
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Idle minutes"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:417
 msgid "Close tunnels when idle"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:423
 msgid "New Keys on Reopen"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:423
 msgid "Disable"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "Delay tunnel open until required"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:447
 msgid "Persistent private key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:453
 msgid "File"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:457
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
 msgid "Local destination"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:486
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
 msgid "(if known)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:466
 msgid "Local Authorization"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:482
 msgid "Username"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:486
 msgid "Password"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:476
 msgid "Outproxy Authorization"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
 msgid "Jump URL List"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Custom options"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:528
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:554
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:699
 msgid "Cancel"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:532
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Delete"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:534
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:560
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:509
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:523
 msgid "Save"
 msgstr ""
 
@@ -676,116 +566,104 @@ msgstr ""
 msgid "Hostname Signature"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:353
-msgid "4 in, 4 out (high traffic server)"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:357
-msgid "5 in, 5 out (high traffic server)"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:361
-msgid "6 in, 6 out (high traffic server)"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:405
 msgid "Encrypt Leaseset"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "Encryption Key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:415
 msgid "Generate New Key"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:417
 msgid "Generate"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:456
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:419
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
 msgid "(Tunnel must be stopped first)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:421
 msgid "Restricted Access List"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:427
 msgid "Whitelist"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:431
 msgid "Blacklist"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
 msgid "Access List"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:439
 msgid "Inbound connection limits (0=unlimited)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:441
 msgid "Per client"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
 msgid "Per minute"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:484
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:447
 msgid "Per hour"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Per day"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:492
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455
 msgid "Total"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Max concurrent connections (0=unlimited)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "New Certificate type"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:483
 msgid "None"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:524
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:487
 msgid "Hashcash (effort)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:530
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:493
 msgid "Hashcash Calc Time"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:495
 msgid "Estimate"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:534
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
 msgid "Hidden"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:538
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
 msgid "Signed (signed by)"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:507
 msgid "Modify Certificate"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:546
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Modify"
 msgstr ""
 
@@ -822,65 +700,65 @@ msgid "I2P Server Tunnels"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:148
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:149
 msgid "Points at"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:170
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:174
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:171
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:175
 msgid "Preview"
 msgstr ""
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:132
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:194
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:195
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:268
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:309
 msgid "Status"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:180
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:181
 msgid "Base32 Address"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:188
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:189
 msgid "No Preview"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:201
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:202
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:316
 msgid "Starting..."
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:208
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:222
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:322
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:336
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:209
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:223
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:323
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:351
 msgid "Stop"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:215
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:216
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:344
 msgid "Running"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:229
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:357
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:230
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:358
 msgid "Stopped"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:236
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:364
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:237
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:365
 msgid "Start"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:251
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:252
 msgid "New server tunnel"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:253
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:411
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:254
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:412
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:223
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:265
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:295
@@ -889,33 +767,37 @@ msgstr ""
 msgid "Standard"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:255
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:256
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:414
 msgid "Create"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:258
 msgid "I2P Client Tunnels"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:294
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:295
 msgid "Interface"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:329
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:330
 msgid "Standby"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:373
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:374
 msgid "Outproxy"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:396
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:377
+msgid "Destination"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:397
 msgid "none"
 msgstr ""
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:410
 msgid "New client tunnel"
 msgstr ""
 

apps/i2ptunnel/locale/messages_es.po

@@ -11,14 +11,14 @@
 # foo <foo@bar>, 2009
 # punkibastardo <punkibastardo@gmail.com>, 2011, 2012
 # punkibastardo <punkibastardo@gmail.com>, 2011
-# trolly <trolly@fastmail.fm>, 2013
+# trolly, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-25 14:49+0000\n"
-"PO-Revision-Date: 2013-04-15 10:42+0000\n"
-"Last-Translator: trolly <trolly@fastmail.fm>\n"
+"POT-Creation-Date: 2013-08-11 14:30+0000\n"
+"PO-Revision-Date: 2013-07-10 11:37+0000\n"
+"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/I2P/language/"
 "es/)\n"
 "Language: es\n"
@@ -27,132 +27,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:571
-msgid "This seems to be a bad destination:"
-msgstr "Éste parece ser un destino falso:"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:571
-msgid "i2paddresshelper cannot help you with a destination like that!"
-msgstr "El ayudante de direcciones no te puede ayudar con un destino así."
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:638
-#, 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 ""
-"Para visitar el destino en la base de datos de hosts, ¡pincha <a href="
-"\"{0}\">aquí</a>! Para visitar el destino del ayudante de direcciones en "
-"conflicto, ¡pincha <a href=\"{1}\">aquí</a>!"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1042
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:426
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:410
-msgid "Host"
-msgstr "Host"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1046
-msgid "Base 32"
-msgstr "Base 32"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1050
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:377
-msgid "Destination"
-msgstr "Destino"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1056
-#, java-format
-msgid "Continue to {0} without saving"
-msgstr "Acceder a {0} sin guardar"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1061
-#, java-format
-msgid "Save {0} to router address book and continue to eepsite"
-msgstr ""
-"Guardar {0} a la libreta de direcciones del router y acceder al sitio i2p."
-
-#. only blockfile supports multiple books
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1064
-#, java-format
-msgid "Save {0} to master address book and continue to eepsite"
-msgstr ""
-"Guardar {0} a la libreta de direcciones principal y acceder al sitio i2p."
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1065
-#, java-format
-msgid "Save {0} to private address book and continue to eepsite"
-msgstr ""
-"Guardar {0} a la libreta de direcciones privada y acceder al sitio i2p."
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1179
-msgid "HTTP Outproxy"
-msgstr "Puerta de salida HTTP"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
-msgid ""
-"Click a link below to look for an address helper by using a \"jump\" service:"
-msgstr ""
-"Pincha en un enlace de debajo para buscar un ayudante de direcciones "
-"mediante el uso de un servicio de \"salto\":"
-
-#. Translators: parameter is a host name
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1220
-#, java-format
-msgid "{0} jump service"
-msgstr "servicio saltador {0}"
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:163
-#, java-format
-msgid "Added via address helper from {0}"
-msgstr "Agregado por el ayudante de direcciones desde {0}"
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:165
-msgid "Added via address helper"
-msgstr "Agregado por el ayudante de direcciones."
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:190
-#, java-format
-msgid "Redirecting to {0}"
-msgstr "Redireccionando a {0}"
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:196
-msgid "Router Console"
-msgstr "Consola del Router"
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
-msgid "Addressbook"
-msgstr "Libreta de direcciones"
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
-msgid "Configuration"
-msgstr "Ajustes"
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
-msgid "Help"
-msgstr "Ayuda"
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:202
-#, java-format
-msgid "Saved {0} to the {1} addressbook, redirecting now."
-msgstr "{0} ha sido guardado en la libreta {1}, accediendo ahora."
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:203
-#, java-format
-msgid "Failed to save {0} to the {1} addressbook, redirecting now."
-msgstr "No se ha podido guardar {0} en la libreta {1}, accediendo ahora."
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
-msgid "Click here if you are not redirected automatically."
-msgstr "¡Haz click aquí si no estás siendo enviado automáticamente!"
-
 #: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:325
 #: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:335
 msgid "internal"
 msgstr "interno"
 
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:404
+#, java-format
+msgid "{0} inbound, {0} outbound tunnel"
+msgid_plural "{0} inbound, {0} outbound tunnels"
+msgstr[0] "{0} túnel de entrada {0} túnel de salida"
+msgstr[1] "{0} túneles de entrada {0} túneles de salida"
+
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:408
+msgid "lower bandwidth and reliability"
+msgstr "ancho de banda bajo y seguridad"
+
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:410
+msgid "standard bandwidth and reliability"
+msgstr "ancho de banda estándar y seguridad"
+
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:412
+msgid "higher bandwidth and reliability"
+msgstr "alto ancho de banda y seguridad"
+
 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:119
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr "Todavía no se han inicializado los túneles, recargue en dos minutos."
@@ -478,210 +376,189 @@ msgstr "Variación de saltos"
 msgid "Count"
 msgstr "Cantidad"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:331
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
-msgid "1 inbound, 1 outbound tunnel  (low bandwidth usage, less reliability)"
-msgstr ""
-"1 túnel entrante, 1 de salida (bajo uso de ancho de banda, menos fiabilidad)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:335
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:345
-msgid ""
-"2 inbound, 2 outbound tunnels (standard bandwidth usage, standard "
-"reliability)"
-msgstr ""
-"2 túneles entrantes, 2 de salida (uso de ancho de banda estándar, fiabilidad "
-"estándar)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:339
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:349
-msgid ""
-"3 inbound, 3 outbound tunnels (higher bandwidth usage, higher reliability)"
-msgstr ""
-"3 túneles entrantes, 3 de salida (mayor uso de ancho de banda, mayor "
-"fiabilidad)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:348
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370
-msgid "tunnels"
-msgstr "túneles"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:353
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:338
 msgid "Backup Count"
 msgstr "Cantidad de respaldo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:360
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:345
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr "0 túneles de respaldo (redundancia 0, no aumenta el uso de recursos)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:364
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:339
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:349
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr ""
 "1 túnel de respaldo en cada dirección (redundancia baja, uso bajo de "
 "recursos)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:390
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:353
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr ""
 "2 túneles de respaldo en cada dirección (redundancia media, uso de recursos "
 "medio)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:394
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:347
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:357
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr ""
 "3 túneles de respaldo en cada dirección (alta redundancia, uso de recursos "
 "alto)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:402
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:355
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:365
 msgid "backup tunnels"
 msgstr "túneles de respaldo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:387
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:372
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:369
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:379
 msgid "interactive connection"
 msgstr "conexión interactiva"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:373
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:383
 msgid "bulk connection (downloads/websites/BT)"
 msgstr "conexión en masa (descargas/web/BT)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:375
 msgid "Delay Connect"
 msgstr "Retrasar Conexión"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:379
 msgid "for request/response connections"
 msgstr "para las conexiones de solicitud/respuesta"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:383
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:387
 msgid "Router I2CP Address"
 msgstr "Dirección I2CP del router"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:389
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:410
+msgid "Host"
+msgstr "Host"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:397
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:262
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:284
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:431
 msgid "Port"
 msgstr "Puerto"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:403
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Reduce tunnel quantity when idle"
 msgstr "Reducir la cantidad de túneles cuando está inactivo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:444
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:503
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:506
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:419
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:439
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:407
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Enable"
 msgstr "Habilitar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:510
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Reduced tunnel count"
 msgstr "Número de túneles reducido"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:458
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:514
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Idle minutes"
 msgstr "Minutos de inactividad"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:417
 msgid "Close tunnels when idle"
 msgstr "Cerrar los túneles cuando se está inactivo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:423
 msgid "New Keys on Reopen"
 msgstr "Nuevas claves al reabrir"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:423
 msgid "Disable"
 msgstr "Desactivar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "Delay tunnel open until required"
 msgstr "Retrasar apertura del túnel hasta que sea necesario"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:447
 msgid "Persistent private key"
 msgstr "Clave privada persistente"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:453
 msgid "File"
 msgstr "Archivo"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:457
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
 msgid "Local destination"
 msgstr "destino local"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:486
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
 msgid "(if known)"
 msgstr "(si se conoce)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:466
 msgid "Local Authorization"
 msgstr "Autorización local"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:482
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:486
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:476
 msgid "Outproxy Authorization"
 msgstr "Autorización outproxy"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
 msgid "Jump URL List"
 msgstr "Lista de URL de salto"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Custom options"
 msgstr "Opciones personalizadas"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:528
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:554
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:699
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:532
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:534
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:560
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:509
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:523
 msgid "Save"
 msgstr "Guardar"
 
@@ -717,116 +594,104 @@ msgstr "Agregar a la libreta de direcciones local"
 msgid "Hostname Signature"
 msgstr "Firma del Hostname"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:353
-msgid "4 in, 4 out (high traffic server)"
-msgstr "4 de entrada, 4 de salida (servidor con mucho tráfico)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:357
-msgid "5 in, 5 out (high traffic server)"
-msgstr "5 de entrada, 5 de salida (servidor con mucho tráfico)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:361
-msgid "6 in, 6 out (high traffic server)"
-msgstr "6 de entrada, 6 de salida (servidor con mucho tráfico)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:405
 msgid "Encrypt Leaseset"
 msgstr "Cifrar Leaseset"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "Encryption Key"
 msgstr "Clave de cifrado"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:415
 msgid "Generate New Key"
 msgstr "Generar nueva clave"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:417
 msgid "Generate"
 msgstr "Generar"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:456
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:419
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
 msgid "(Tunnel must be stopped first)"
 msgstr "(El túnel debe detenerse primero)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:421
 msgid "Restricted Access List"
 msgstr "Lista de acceso restringido"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:427
 msgid "Whitelist"
 msgstr "Lista blanca"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:431
 msgid "Blacklist"
 msgstr "Lista negra"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
 msgid "Access List"
 msgstr "Lista de acceso"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:439
 msgid "Inbound connection limits (0=unlimited)"
 msgstr "Límites de conexiones entrantes (0 = sin límite)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:441
 msgid "Per client"
 msgstr "Por cliente"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
 msgid "Per minute"
 msgstr "por minuto"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:484
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:447
 msgid "Per hour"
 msgstr "Por hora"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Per day"
 msgstr "Por día"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:492
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455
 msgid "Total"
 msgstr "Total"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Max concurrent connections (0=unlimited)"
 msgstr "Número máximo de conexiones simultáneas (0 = sin límite)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "New Certificate type"
 msgstr "Nuevo tipo de certificado"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:483
 msgid "None"
 msgstr "Ninguno"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:524
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:487
 msgid "Hashcash (effort)"
 msgstr "Hashcash (esfuerzo)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:530
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:493
 msgid "Hashcash Calc Time"
 msgstr "Tiempo de Calc Hashcash "
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:495
 msgid "Estimate"
 msgstr "Estimación"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:534
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
 msgid "Hidden"
 msgstr "Oculto"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:538
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
 msgid "Signed (signed by)"
 msgstr "Firmado (firmado por)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:507
 msgid "Modify Certificate"
 msgstr "Modificar Certificado"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:546
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Modify"
 msgstr "Modificar"
 
@@ -952,6 +817,10 @@ msgstr "En espera"
 msgid "Outproxy"
 msgstr "Puerta de salida"
 
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:377
+msgid "Destination"
+msgstr "Destino"
+
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:397
 msgid "none"
 msgstr "ninguno"
@@ -1376,3 +1245,79 @@ msgstr "Finalizar"
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:724
 msgid "Next"
 msgstr "Siguiente"
+
+#~ msgid "This seems to be a bad destination:"
+#~ msgstr "Éste parece ser un destino falso:"
+
+#~ msgid "i2paddresshelper cannot help you with a destination like that!"
+#~ msgstr "El ayudante de direcciones no te puede ayudar con un destino así."
+
+#~ 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 ""
+#~ "Para visitar el destino en la base de datos de hosts, ¡pincha <a href="
+#~ "\"{0}\">aquí</a>! Para visitar el destino del ayudante de direcciones en "
+#~ "conflicto, ¡pincha <a href=\"{1}\">aquí</a>!"
+
+#~ msgid "Base 32"
+#~ msgstr "Base 32"
+
+#~ msgid "Continue to {0} without saving"
+#~ msgstr "Acceder a {0} sin guardar"
+
+#~ msgid "Save {0} to router address book and continue to eepsite"
+#~ msgstr ""
+#~ "Guardar {0} a la libreta de direcciones del router y acceder al sitio i2p."
+
+#~ msgid "Save {0} to master address book and continue to eepsite"
+#~ msgstr ""
+#~ "Guardar {0} a la libreta de direcciones principal y acceder al sitio i2p."
+
+#~ msgid "Save {0} to private address book and continue to eepsite"
+#~ msgstr ""
+#~ "Guardar {0} a la libreta de direcciones privada y acceder al sitio i2p."
+
+#~ msgid "HTTP Outproxy"
+#~ msgstr "Puerta de salida HTTP"
+
+#~ msgid ""
+#~ "Click a link below to look for an address helper by using a \"jump\" "
+#~ "service:"
+#~ msgstr ""
+#~ "Pincha en un enlace de debajo para buscar un ayudante de direcciones "
+#~ "mediante el uso de un servicio de \"salto\":"
+
+#~ msgid "{0} jump service"
+#~ msgstr "servicio saltador {0}"
+
+#~ msgid "Added via address helper from {0}"
+#~ msgstr "Agregado por el ayudante de direcciones desde {0}"
+
+#~ msgid "Added via address helper"
+#~ msgstr "Agregado por el ayudante de direcciones."
+
+#~ msgid "Redirecting to {0}"
+#~ msgstr "Redireccionando a {0}"
+
+#~ msgid "Router Console"
+#~ msgstr "Consola del Router"
+
+#~ msgid "Addressbook"
+#~ msgstr "Libreta de direcciones"
+
+#~ msgid "Configuration"
+#~ msgstr "Ajustes"
+
+#~ msgid "Help"
+#~ msgstr "Ayuda"
+
+#~ msgid "Saved {0} to the {1} addressbook, redirecting now."
+#~ msgstr "{0} ha sido guardado en la libreta {1}, accediendo ahora."
+
+#~ msgid "Failed to save {0} to the {1} addressbook, redirecting now."
+#~ msgstr "No se ha podido guardar {0} en la libreta {1}, accediendo ahora."
+
+#~ msgid "Click here if you are not redirected automatically."
+#~ msgstr "¡Haz click aquí si no estás siendo enviado automáticamente!"

apps/i2ptunnel/locale/messages_fr.po

@@ -4,16 +4,17 @@
 # To contribute translations, see http://www.i2p2.de/newdevelopers
 #
 # Translators:
-# ducki2p <ducki2p@gmail.com>, 2011.
-# foo <foo@bar>, 2009.
-#  Boxoa590, 2013.
-#   Boxoa590, 2012.
+# Boxoa590, 2012-2013
+# ducki2p <ducki2p@gmail.com>, 2011
+# foo <foo@bar>, 2009
+# Boxoa590, 2013
+# Boxoa590, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-22 13:13+0000\n"
-"PO-Revision-Date: 2013-02-11 17:38+0000\n"
+"POT-Creation-Date: 2013-09-20 10:24+0000\n"
+"PO-Revision-Date: 2013-08-13 14:14+0000\n"
 "Last-Translator: Boxoa590\n"
 "Language-Team: French (http://www.transifex.com/projects/p/I2P/language/"
 "fr/)\n"
@@ -23,130 +24,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:558
-msgid "This seems to be a bad destination:"
-msgstr "Cela semble être une mauvaise destination"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:558
-msgid "i2paddresshelper cannot help you with a destination like that!"
-msgstr ""
-"i2paddresshelper ne peut pas vous aider avec une destination comme cela !"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:625
-#, 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 ""
-"Pour aller à la destination de votre base de données d''hôtes, cliquez <a "
-"href=\"{0}\">here</a>. Pour aller à la destination de l''aide d''adresse en "
-"conflit, cliquez <a href=\"{1}\">ici</a>."
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1029
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:426
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:410
-msgid "Host"
-msgstr "Hôte"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1033
-msgid "Base 32"
-msgstr "Base 32"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1037
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:377
-msgid "Destination"
-msgstr "Destination"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1043
-#, java-format
-msgid "Continue to {0} without saving"
-msgstr "Aller sur le site i2p {0} sans enregistrer dans un carnet d'adresses. "
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1048
-#, java-format
-msgid "Save {0} to router address book and continue to eepsite"
-msgstr "Ajouter au carnet d''adresse du routeur {0} et aller sur le site i2p"
-
-#. only blockfile supports multiple books
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1051
-#, java-format
-msgid "Save {0} to master address book and continue to eepsite"
-msgstr "Ajouter au carnet d''adresse principal {0} et aller sur le site i2p"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1052
-#, java-format
-msgid "Save {0} to private address book and continue to eepsite"
-msgstr "Ajouter au carnet d''adresse privé {0} et aller sur le site i2p"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1166
-msgid "HTTP Outproxy"
-msgstr "proxy sortant HTTP"
-
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1171
-msgid ""
-"Click a link below to look for an address helper by using a \"jump\" service:"
-msgstr ""
-"Cliquez sur un des liens ci-dessous pour chercher une aide d'adresse en "
-"utilisant un \"service de saut\":"
-
-#. Translators: parameter is a host name
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1207
-#, java-format
-msgid "{0} jump service"
-msgstr "{0} jump service"
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:163
-#, java-format
-msgid "Added via address helper from {0}"
-msgstr ""
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:165
-msgid "Added via address helper"
-msgstr "Ajouté via assitant d'adresse"
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:190
-#, java-format
-msgid "Redirecting to {0}"
-msgstr "Redirection vers {0}"
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:196
-msgid "Router Console"
-msgstr "Console du routeur"
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
-msgid "Addressbook"
-msgstr "Carnet d'adresses"
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
-msgid "Configuration"
-msgstr "Configuration"
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:197
-msgid "Help"
-msgstr "Aide"
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:202
-#, java-format
-msgid "Saved {0} to the {1} addressbook, redirecting now."
-msgstr "{0} ajouté au carnet d''adresses {1}. Redirection en cours."
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:203
-#, java-format
-msgid "Failed to save {0} to the {1} addressbook, redirecting now."
-msgstr "{0} non ajouté au carnet d''adresses {1}. Redirection en cours."
-
-#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205
-msgid "Click here if you are not redirected automatically."
-msgstr "Cliquez ici si vous n'êtes pas redirigé automatiquement."
-
 #: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:325
 #: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:335
 msgid "internal"
 msgstr "interne"
 
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:404
+#, java-format
+msgid "{0} inbound, {0} outbound tunnel"
+msgid_plural "{0} inbound, {0} outbound tunnels"
+msgstr[0] "{0} entrant, {0} sortant tunnels"
+msgstr[1] "{0} entrants, {0} sortants tunnels"
+
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:408
+msgid "lower bandwidth and reliability"
+msgstr "bande passante et fiabilité plus basses"
+
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:410
+msgid "standard bandwidth and reliability"
+msgstr "basse passante et fiabilité standards"
+
+#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:412
+msgid "higher bandwidth and reliability"
+msgstr "basse passante et fiabilité plus élevées"
+
 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:119
 msgid "Tunnels are not initialized yet, please reload in two minutes."
 msgstr ""
@@ -470,213 +371,191 @@ msgstr "variance de saut"
 msgid "Count"
 msgstr "Nombre"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:331
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
-msgid "1 inbound, 1 outbound tunnel  (low bandwidth usage, less reliability)"
-msgstr ""
-"Tunnel à 1 entrant/1 sortant (faible consommation de bande passante, moins "
-"fiable)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:335
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:345
-msgid ""
-"2 inbound, 2 outbound tunnels (standard bandwidth usage, standard "
-"reliability)"
-msgstr ""
-"Tunnels à 2 entrants/2 sortants (consommation de bande passante standard, "
-"fiabilité standard)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:339
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:349
-msgid ""
-"3 inbound, 3 outbound tunnels (higher bandwidth usage, higher reliability)"
-msgstr ""
-"Tunnels à 3 entrants/3 sortants (consommation de bande passante plus élevée, "
-"fiabilité élevée)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:348
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370
-msgid "tunnels"
-msgstr "tunnels"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:353
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:338
 msgid "Backup Count"
 msgstr "Secours"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:360
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:382
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:335
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:345
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr ""
 "Aucun tunnel de secours (pas de tolérance de pannes, pas de consommation de "
 "ressources) "
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:364
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:386
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:339
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:349
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr ""
 "1 tunnel de secours par direction (légère tolérance de pannes, faible "
 "consommation de ressources)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:390
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:353
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr ""
 "2 tunnels de secours par direction (tolérance de pannes moyenne, "
 "consommation de ressources moyenne)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:394
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:347
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:357
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr ""
 "3 tunnels de secours par direction (tolérance de pannes élevée, consommation "
 "de ressources élevée)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:402
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:355
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:365
 msgid "backup tunnels"
 msgstr "Tunnels de secours"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:387
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:372
 msgid "Profile"
 msgstr "Profil"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:369
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:379
 msgid "interactive connection"
 msgstr "connexion interactive"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:373
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:383
 msgid "bulk connection (downloads/websites/BT)"
 msgstr "connexion forts transferts (téléchargements/sites web/BT)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:375
 msgid "Delay Connect"
 msgstr "Retard à la connexion"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:379
 msgid "for request/response connections"
 msgstr "pour les connexions de demandes/réponses"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:383
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:387
 msgid "Router I2CP Address"
 msgstr "Adresse I2CP du routeur"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:385
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:389
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:410
+msgid "Host"
+msgstr "Hôte"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:397
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:262
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:284
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:431
 msgid "Port"
 msgstr "Port"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:504
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:403
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
 msgid "Reduce tunnel quantity when idle"
 msgstr "Réduire le nombre de tunnels quand inactif"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:444
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:503
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:506
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:419
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:439
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:449
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:407
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Enable"
 msgstr "Activer"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:434
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:510
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Reduced tunnel count"
 msgstr "Réduire à"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:458
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:514
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Idle minutes"
 msgstr "Minutes d'inactivité"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:417
 msgid "Close tunnels when idle"
 msgstr "Fermer les tunnels quand inactif"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:423
 msgid "New Keys on Reopen"
 msgstr "Nouvelles clés à la réouverture"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:423
 msgid "Disable"
 msgstr "Désactiver"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:462
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
 msgid "Delay tunnel open until required"
 msgstr "Retarder l'ouverture jusqu'à l'utilisation"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:447
 msgid "Persistent private key"
 msgstr "Clé privée persistante"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:453
 msgid "File"
 msgstr "Fichier"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:457
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
 msgid "Local destination"
 msgstr "Destination locale"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:486
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
 msgid "(if known)"
 msgstr "(si connu)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:466
 msgid "Local Authorization"
 msgstr "Autorisation locale"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:482
 msgid "Username"
 msgstr "Identifiant"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:486
 msgid "Password"
 msgstr "Mot de passe"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:476
 msgid "Outproxy Authorization"
 msgstr "Autorisation de mandataire sortant"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
 msgid "Jump URL List"
 msgstr "Liste d'URL de sauts"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:550
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
 msgid "Custom options"
 msgstr "Options personnelles"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:528
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:554
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:503
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:699
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:532
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:534
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:560
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:509
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:523
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -712,116 +591,104 @@ msgstr "Ajouter au carnet d'adresses local"
 msgid "Hostname Signature"
 msgstr "Signature du nom d'hôte"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:353
-msgid "4 in, 4 out (high traffic server)"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:357
-msgid "5 in, 5 out (high traffic server)"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:361
-msgid "6 in, 6 out (high traffic server)"
-msgstr ""
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:405
 msgid "Encrypt Leaseset"
 msgstr "Jeu de baux crypté"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 msgid "Encryption Key"
 msgstr "Clé de cryptage"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:415
 msgid "Generate New Key"
 msgstr "Générer une nouvelle clé"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:454
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:417
 msgid "Generate"
 msgstr "Générer"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:456
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:419
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
 msgid "(Tunnel must be stopped first)"
 msgstr "(Le tunnel doit préalablement être arrêté)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:458
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:421
 msgid "Restricted Access List"
 msgstr "Contrôle d'accès"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:427
 msgid "Whitelist"
 msgstr "Liste blanche"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:431
 msgid "Blacklist"
 msgstr "Liste noire"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
 msgid "Access List"
 msgstr "Liste d'accès"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:439
 msgid "Inbound connection limits (0=unlimited)"
 msgstr "Limite de connexions entrantes (0=pas de limite)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:441
 msgid "Per client"
 msgstr "Par client"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
 msgid "Per minute"
 msgstr "Par minute"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:484
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:447
 msgid "Per hour"
 msgstr "Par heure"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
 msgid "Per day"
 msgstr "Par jour"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:492
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455
 msgid "Total"
 msgstr "Total"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Max concurrent connections (0=unlimited)"
 msgstr "Connexions simultanées maximum (0=pas de limite)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:518
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
 msgid "New Certificate type"
 msgstr "Type de nouveau certificat"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:520
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:483
 msgid "None"
 msgstr "Aucun"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:524
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:487
 msgid "Hashcash (effort)"
 msgstr "Pénalité"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:530
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:493
 msgid "Hashcash Calc Time"
 msgstr "Durée de calcul de pénalisation"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:495
 msgid "Estimate"
 msgstr "Estimer"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:534
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
 msgid "Hidden"
 msgstr "Masqué"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:538
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
 msgid "Signed (signed by)"
 msgstr "Signé (signé par)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:507
 msgid "Modify Certificate"
 msgstr "Modifier le certificat"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:546
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
 msgid "Modify"
 msgstr "Modifier"
 
@@ -947,6 +814,10 @@ msgstr "Pause"
 msgid "Outproxy"
 msgstr "Mandataire sortant"
 
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:377
+msgid "Destination"
+msgstr "Destination"
+
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:397
 msgid "none"
 msgstr "aucun"

apps/jetty/.classpath

@@ -4,7 +4,10 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
 	<classpathentry kind="lib" path="jettylib/javax.servlet.jar"/>
+	<classpathentry kind="lib" path="jettylib/jetty-http.jar"/>
+	<classpathentry kind="lib" path="jettylib/jetty-io.jar"/>
 	<classpathentry kind="lib" path="jettylib/jetty-util.jar"/>
+	<classpathentry kind="lib" path="jettylib/jetty-xml.jar"/>
 	<classpathentry kind="lib" path="jettylib/org.mortbay.jetty.jar"/>
 	<classpathentry kind="output" path="build/obj"/>
 </classpath>

apps/jetty/apache-tomcat-deployer/NOTICE

@@ -1,5 +1,5 @@
 Apache Tomcat
-Copyright 1999-2012 The Apache Software Foundation
+Copyright 1999-2013 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

apps/jetty/build.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir="." default="all" name="jetty">
 
-    <property name="jetty.ver" value="7.6.10.v20130312" />
+    <property name="jetty.ver" value="7.6.12.v20130726" />
     <property name="jetty.base" value="jetty-distribution-${jetty.ver}" />
-    <property name="jetty.sha1" value="8c0ff0ad83756de118f5af71b88ca9c78ebf6420" />
+    <property name="jetty.sha1" value="986f66f3fbd3a6354e0664e3c189260327d180ad" />
     <property name="jetty.filename" value="${jetty.base}.zip" />
     <property name="jetty.url" value="http://download.eclipse.org/jetty/${jetty.ver}/dist/${jetty.filename}" />
     <property name="verified.filename" value="verified.txt" />
@@ -250,6 +250,8 @@
                 <attribute name="Built-By" value="${build.built-by}" />
                 <attribute name="Build-Date" value="${build.timestamp}" />
                 <attribute name="Base-Revision" value="${workspace.version}" />
+                <!-- needed by JettyStart for pre-0.7.5 wrapper.config -->
+                <attribute name="Class-Path" value="jetty-deploy.jar jetty-xml.jar" />
                 <attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
             </manifest>
         </jar>

apps/jetty/java/src/net/i2p/jetty/I2PDigestAuthenticator.java

@@ -1,434 +0,0 @@
-//
-//  ========================================================================
-//  Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd.
-//  ------------------------------------------------------------------------
-//  All rights reserved. This program and the accompanying materials
-//  are made available under the terms of the Eclipse Public License v1.0
-//  and Apache License v2.0 which accompanies this distribution.
-//
-//      The Eclipse Public License is available at
-//      http://www.eclipse.org/legal/epl-v10.html
-//
-//      The Apache License v2.0 is available at
-//      http://www.opensource.org/licenses/apache2.0.php
-//
-//  You may elect to redistribute this code under either of these licenses.
-//  ========================================================================
-//
-
-package net.i2p.jetty;
-
-import java.io.IOException;
-import java.security.MessageDigest;
-import java.security.SecureRandom;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.ConcurrentMap;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.eclipse.jetty.http.HttpHeaders;
-import org.eclipse.jetty.security.SecurityHandler;
-import org.eclipse.jetty.security.ServerAuthException;
-import org.eclipse.jetty.security.UserAuthentication;
-import org.eclipse.jetty.security.authentication.DeferredAuthentication;
-import org.eclipse.jetty.security.authentication.DigestAuthenticator;
-import org.eclipse.jetty.server.Authentication;
-import org.eclipse.jetty.server.Authentication.User;
-import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.server.UserIdentity;
-import org.eclipse.jetty.util.B64Code;
-import org.eclipse.jetty.util.QuotedStringTokenizer;
-import org.eclipse.jetty.util.StringUtil;
-import org.eclipse.jetty.util.TypeUtil;
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
-import org.eclipse.jetty.util.security.Constraint;
-import org.eclipse.jetty.util.security.Credential;
-
-/**
- * I2P fixes for out-of-order nonce counts.
- * Based on DigestAuthenticator in Jetty 7.6.10.
- * Includes the nonce count verification code from Tomcat 7.0.35.
- * ref: http://jira.codehaus.org/browse/JETTY-1468 which was closed not-a-bug.
- * ref: https://bugs.eclipse.org/bugs/show_bug.cgi?id=336443 in which the
- * Jetty implementation was introduced.
- * 
- * @since 0.9.6
- * 
- * @version $Rev: 4793 $ $Date: 2009-03-19 00:00:01 +0100 (Thu, 19 Mar 2009) $
- * 
- * The nonce max age in ms can be set with the {@link SecurityHandler#setInitParameter(String, String)} 
- * using the name "maxNonceAge"
- */
-public class I2PDigestAuthenticator extends DigestAuthenticator
-{
-    // shadows super
-    private static final Logger LOG = Log.getLogger(I2PDigestAuthenticator.class);
-    SecureRandom _random = new SecureRandom();
-    // shadows super
-    private long _maxNonceAgeMs = 60*60*1000L;
-    private ConcurrentMap<String, Nonce> _nonceCount = new ConcurrentHashMap<String, Nonce>();
-    // shadows super
-    private Queue<Nonce> _nonceQueue = new ConcurrentLinkedQueue<Nonce>();
-
-    /*
-     * Shadows super
-     *
-     * Contains code from Tomcat 7.0.35 DigestAuthenticator.NonceInfo
-     *
-     * Licensed to the Apache Software Foundation (ASF) under one or more
-     * contributor license agreements.  See the NOTICE file distributed with
-     * this work for additional information regarding copyright ownership.
-     * The ASF licenses this file to You under the Apache License, Version 2.0
-     * (the "License"); you may not use this file except in compliance with
-     * the License.  You may obtain a copy of the License at
-     *
-     *      http://www.apache.org/licenses/LICENSE-2.0
-     *
-     * Unless required by applicable law or agreed to in writing, software
-     * distributed under the License is distributed on an "AS IS" BASIS,
-     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     * See the License for the specific language governing permissions and
-     * limitations under the License.
-     */
-    private static class Nonce
-    {
-        final String _nonce;
-        final long _ts;
-        private volatile boolean seen[];
-        private volatile int offset;
-        private volatile int count = 0;
-        private static final int seenWindowSize = 100;
-
-        public Nonce(String nonce, long ts)
-        {
-            _nonce=nonce;
-            _ts=ts;
-            seen = new boolean[seenWindowSize];
-            offset = seenWindowSize / 2;
-        }
-
-        public synchronized boolean nonceCountValid(long nonceCount) {
-            if ((count - offset) >= nonceCount ||
-                    (nonceCount > count - offset + seen.length)) {
-                return false;
-            }
-            int checkIndex = (int) ((nonceCount + offset) % seen.length);
-            if (seen[checkIndex]) {
-                return false;
-            } else {
-                seen[checkIndex] = true;
-                seen[count % seen.length] = false;
-                count++;
-                return true;
-            }
-        }
-    }
-
-    /* ------------------------------------------------------------ */
-    public I2PDigestAuthenticator()
-    {
-        super();
-    }
-
-    
-    /* ------------------------------------------------------------ */
-
-    /**
-     *  Store local copy since field in super is private
-     */
-    @Override
-    public synchronized void setMaxNonceAge(long maxNonceAgeInMillis)
-    {
-        super.setMaxNonceAge(maxNonceAgeInMillis);
-        _maxNonceAgeMs = maxNonceAgeInMillis;
-    }
-
-    /* ------------------------------------------------------------ */
-
-    /**
-     *  No changes from super
-     */
-    @Override
-    public Authentication validateRequest(ServletRequest req, ServletResponse res, boolean mandatory) throws ServerAuthException
-    {
-        if (!mandatory)
-            return new DeferredAuthentication(this);
-
-        HttpServletRequest request = (HttpServletRequest)req;
-        HttpServletResponse response = (HttpServletResponse)res;
-        String credentials = request.getHeader(HttpHeaders.AUTHORIZATION);
-
-        try
-        {
-            boolean stale = false;
-            if (credentials != null)
-            {
-                if (LOG.isDebugEnabled()) 
-                    LOG.debug("Credentials: " + credentials);
-                QuotedStringTokenizer tokenizer = new QuotedStringTokenizer(credentials, "=, ", true, false);
-                final Digest digest = new Digest(request.getMethod());
-                String last = null;
-                String name = null;
-
-                while (tokenizer.hasMoreTokens())
-                {
-                    String tok = tokenizer.nextToken();
-                    char c = (tok.length() == 1) ? tok.charAt(0) : '\0';
-
-                    switch (c)
-                    {
-                        case '=':
-                            name = last;
-                            last = tok;
-                            break;
-                        case ',':
-                            name = null;
-                            break;
-                        case ' ':
-                            break;
-
-                        default:
-                            last = tok;
-                            if (name != null)
-                            {
-                                if ("username".equalsIgnoreCase(name))
-                                    digest.username = tok;
-                                else if ("realm".equalsIgnoreCase(name))
-                                    digest.realm = tok;
-                                else if ("nonce".equalsIgnoreCase(name))
-                                    digest.nonce = tok;
-                                else if ("nc".equalsIgnoreCase(name))
-                                    digest.nc = tok;
-                                else if ("cnonce".equalsIgnoreCase(name))
-                                    digest.cnonce = tok;
-                                else if ("qop".equalsIgnoreCase(name))
-                                    digest.qop = tok;
-                                else if ("uri".equalsIgnoreCase(name))
-                                    digest.uri = tok;
-                                else if ("response".equalsIgnoreCase(name)) 
-                                    digest.response = tok;
-                                name=null;
-                            }
-                    }
-                }
-
-                int n = checkNonce(digest,(Request)request);
-
-                if (n > 0)
-                {
-                    UserIdentity user = _loginService.login(digest.username,digest);
-                    if (user!=null)
-                    {
-                        renewSession(request,response);
-                        return new UserAuthentication(getAuthMethod(),user);
-                    }
-                }
-                else if (n == 0) 
-                    stale = true;
-
-            }
-
-            if (!DeferredAuthentication.isDeferred(response))
-            {
-                String domain = request.getContextPath();
-                if (domain == null) 
-                    domain = "/";
-                response.setHeader(HttpHeaders.WWW_AUTHENTICATE, "Digest realm=\"" + _loginService.getName()
-                        + "\", domain=\""
-                        + domain
-                        + "\", nonce=\""
-                        + newNonce((Request)request)
-                        + "\", algorithm=MD5, qop=\"auth\","
-                        + " stale=" + stale);
-                response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
-
-                return Authentication.SEND_CONTINUE;
-            }
-
-            return Authentication.UNAUTHENTICATED;
-        }
-        catch (IOException e)
-        {
-            throw new ServerAuthException(e);
-        }
-
-    }
-
-    /* ------------------------------------------------------------ */
-
-    /**
-     *  No changes from super
-     */
-    @Override
-    public String newNonce(Request request)
-    {
-        Nonce nonce;
-        
-        do
-        {
-            byte[] nounce = new byte[24];
-            _random.nextBytes(nounce);
-
-            nonce = new Nonce(new String(B64Code.encode(nounce)),request.getTimeStamp());
-        }
-        while (_nonceCount.putIfAbsent(nonce._nonce,nonce)!=null);
-        _nonceQueue.add(nonce);
-               
-        return nonce._nonce;
-    }
-
-    /**
-     * @param nstring nonce to check
-     * @param request
-     * @return -1 for a bad nonce, 0 for a stale none, 1 for a good nonce
-     */
-    /* ------------------------------------------------------------ */
-
-    /**
-     *  Contains fixes
-     */
-    private int checkNonce(Digest digest, Request request)
-    {
-        // firstly let's expire old nonces
-        long expired;
-        synchronized (this)
-        {
-            expired = request.getTimeStamp()-_maxNonceAgeMs;
-        }
-        
-        Nonce nonce=_nonceQueue.peek();
-        while (nonce!=null && nonce._ts<expired)
-        {
-            _nonceQueue.remove(nonce);
-            _nonceCount.remove(nonce._nonce);
-            nonce=_nonceQueue.peek();
-        }
-        
-       
-        try
-        {
-            nonce = _nonceCount.get(digest.nonce);
-            if (nonce==null)
-                return 0;
-            
-            long count = Long.parseLong(digest.nc,16);
-            if (count>Integer.MAX_VALUE)
-                return 0;
-            if (!nonce.nonceCountValid(count)) {
-                return -1;
-            }
-            return 1;
-        }
-        catch (Exception e)
-        {
-            LOG.ignore(e);
-        }
-        return -1;
-    }
-
-    /* ------------------------------------------------------------ */
-    /* ------------------------------------------------------------ */
-    /* ------------------------------------------------------------ */
-
-    /**
-     *  Shadows super.
-     *  No changes from super
-     */
-    private static class Digest extends Credential
-    {
-        private static final long serialVersionUID = -2484639019549527724L;
-        final String method;
-        String username = "";
-        String realm = "";
-        String nonce = "";
-        String nc = "";
-        String cnonce = "";
-        String qop = "";
-        String uri = "";
-        String response = "";
-
-        /* ------------------------------------------------------------ */
-        Digest(String m)
-        {
-            method = m;
-        }
-
-        /* ------------------------------------------------------------ */
-        @Override
-        public boolean check(Object credentials)
-        {
-            if (credentials instanceof char[])
-                credentials=new String((char[])credentials);
-            String password = (credentials instanceof String) ? (String) credentials : credentials.toString();
-
-            try
-            {
-                MessageDigest md = MessageDigest.getInstance("MD5");
-                byte[] ha1;
-                if (credentials instanceof Credential.MD5)
-                {
-                    // Credentials are already a MD5 digest - assume it's in
-                    // form user:realm:password (we have no way to know since
-                    // it's a digest, alright?)
-                    ha1 = ((Credential.MD5) credentials).getDigest();
-                }
-                else
-                {
-                    // calc A1 digest
-                    md.update(username.getBytes(StringUtil.__ISO_8859_1));
-                    md.update((byte) ':');
-                    md.update(realm.getBytes(StringUtil.__ISO_8859_1));
-                    md.update((byte) ':');
-                    md.update(password.getBytes(StringUtil.__ISO_8859_1));
-                    ha1 = md.digest();
-                }
-                // calc A2 digest
-                md.reset();
-                md.update(method.getBytes(StringUtil.__ISO_8859_1));
-                md.update((byte) ':');
-                md.update(uri.getBytes(StringUtil.__ISO_8859_1));
-                byte[] ha2 = md.digest();
-
-                // calc digest
-                // request-digest = <"> < KD ( H(A1), unq(nonce-value) ":"
-                // nc-value ":" unq(cnonce-value) ":" unq(qop-value) ":" H(A2) )
-                // <">
-                // request-digest = <"> < KD ( H(A1), unq(nonce-value) ":" H(A2)
-                // ) > <">
-
-                md.update(TypeUtil.toString(ha1, 16).getBytes(StringUtil.__ISO_8859_1));
-                md.update((byte) ':');
-                md.update(nonce.getBytes(StringUtil.__ISO_8859_1));
-                md.update((byte) ':');
-                md.update(nc.getBytes(StringUtil.__ISO_8859_1));
-                md.update((byte) ':');
-                md.update(cnonce.getBytes(StringUtil.__ISO_8859_1));
-                md.update((byte) ':');
-                md.update(qop.getBytes(StringUtil.__ISO_8859_1));
-                md.update((byte) ':');
-                md.update(TypeUtil.toString(ha2, 16).getBytes(StringUtil.__ISO_8859_1));
-                byte[] digest = md.digest();
-
-                // check digest
-                return (TypeUtil.toString(digest, 16).equalsIgnoreCase(response));
-            }
-            catch (Exception e)
-            {
-                LOG.warn(e);
-            }
-
-            return false;
-        }
-
-        public String toString()
-        {
-            return username + "," + response;
-        }
-    }
-}