add missing wrapper.jar to installer-nowindows

installer target fixes
rename windows installer; 0.9
2012-05-02 13:14:44 +00:00 · 2012-05-01 23:41:04 +00:00 · 2012-05-01 21:06:17 +00:00 · 2012-04-29 17:31:24 +00:00 · 2012-04-26 23:01:12 +00:00 · 2012-04-26 18:37:18 +00:00
1291 changed files with 264797 additions and 76856 deletions
--- a/.mtn-ignore
+++ b/.mtn-ignore
@ -22,3 +22,5 @@ _jsp\.java$
 ~$
 /build/
 /classes/
+^debian/copyright
+override.properties
--- a/.tx/config
+++ b/.tx/config
@ -2,65 +2,118 @@
 source_file = apps/i2ptunnel/locale/messages_en.po
 source_lang = en
 trans.ar = apps/i2ptunnel/locale/messages_ar.po
+trans.cs = apps/i2ptunnel/locale/messages_cs.po
+trans.da = apps/i2ptunnel/locale/messages_da.po
 trans.de = apps/i2ptunnel/locale/messages_de.po
 trans.es = apps/i2ptunnel/locale/messages_es.po
 trans.fr = apps/i2ptunnel/locale/messages_fr.po
+trans.it = apps/i2ptunnel/locale/messages_it.po
 trans.nl = apps/i2ptunnel/locale/messages_nl.po
 trans.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.routerconsole]
 source_file = apps/routerconsole/locale/messages_en.po
 source_lang = en
 trans.ar = apps/routerconsole/locale/messages_ar.po
+trans.cs = apps/routerconsole/locale/messages_cs.po
+trans.da = apps/routerconsole/locale/messages_da.po
 trans.de = apps/routerconsole/locale/messages_de.po
+trans.et_EE = apps/routerconsole/locale/messages_ee.po
 trans.es = apps/routerconsole/locale/messages_es.po
+trans.fi = apps/routerconsole/locale/messages_fi.po
 trans.fr = apps/routerconsole/locale/messages_fr.po
+trans.it = apps/routerconsole/locale/messages_it.po
 trans.nl = apps/routerconsole/locale/messages_nl.po
+trans.pl = apps/routerconsole/locale/messages_pl.po
 trans.ru = apps/routerconsole/locale/messages_ru.po
+trans.sv_SE = apps/routerconsole/locale/messages_sv.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.i2psnark]
 source_file = apps/i2psnark/locale/messages_en.po
 source_lang = en
 trans.ar = apps/i2psnark/locale/messages_ar.po
+trans.cs = apps/i2psnark/locale/messages_cs.po
 trans.de = apps/i2psnark/locale/messages_de.po
 trans.es = apps/i2psnark/locale/messages_es.po
 trans.fr = apps/i2psnark/locale/messages_fr.po
+trans.it = apps/i2psnark/locale/messages_it.po
 trans.nl = apps/i2psnark/locale/messages_nl.po
+trans.pl = apps/i2psnark/locale/messages_pl.po
 trans.pt = apps/i2psnark/locale/messages_pt.po
 trans.ru = apps/i2psnark/locale/messages_ru.po
+trans.sv_SE = apps/i2psnark/locale/messages_sv.po
+trans.vi = apps/i2psnark/locale/messages_vi.po
 trans.zh_CN = apps/i2psnark/locale/messages_zh.po

 [I2P.susidns]
 source_file = apps/susidns/locale/messages_en.po
 source_lang = en
 trans.ar = apps/susidns/locale/messages_ar.po
+trans.cs = apps/susidns/locale/messages_cs.po
+trans.da = apps/susidns/locale/messages_da.po
 trans.de = apps/susidns/locale/messages_de.po
 trans.es = apps/susidns/locale/messages_es.po
 trans.fr = apps/susidns/locale/messages_fr.po
+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.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
 trans.zh_CN = apps/susidns/locale/messages_zh.po

 [I2P.desktopgui]
 source_file = apps/desktopgui/locale/messages_en.po
 source_lang = en
 trans.ar = apps/desktopgui/locale/messages_ar.po
+trans.cs = apps/desktopgui/locale/messages_cs.po
+trans.da = apps/desktopgui/locale/messages_da.po
 trans.de = apps/desktopgui/locale/messages_de.po
 trans.es = apps/desktopgui/locale/messages_es.po
 trans.fr = apps/desktopgui/locale/messages_fr.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.sv_SE = apps/desktopgui/locale/messages_sv.po
+trans.uk_UA = apps/desktopgui/locale/messages_uk.po
+trans.vi = apps/desktopgui/locale/messages_vi.po
 trans.zh_CN = apps/desktopgui/locale/messages_zh.po

 [I2P.susimail]
 source_file = apps/susimail/locale/messages_en.po
 source_lang = en
+trans.cs = apps/susimail/locale/messages_cs.po
 trans.de = apps/susimail/locale/messages_de.po
 trans.es = apps/susimail/locale/messages_es.po
 trans.fr = apps/susimail/locale/messages_fr.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.sv_SE = apps/susimail/locale/messages_sv.po
+trans.pl = apps/susimail/locale/messages_pl.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
+
+[I2P.debconf]
+source_file = debian/po/templates.pot
+source_lang = en
+trans.cs = debian/po/cs.po
+trans.de = debian/po/de.po
+trans.es = debian/po/es.po
+trans.pl = debian/po/pl.po
+trans.ru = debian/po/ru.po
+trans.sv_SE = debian/po/sv.po
+trans.uk_UA = debian/po/uk.po

 [main]
 host = http://www.transifex.net
--- a/INSTALL-headless.txt
+++ b/INSTALL-headless.txt
@ -1,4 +1,4 @@
-Headless I2P installation instructions
+Headless (console mode) I2P installation instructions

 1) java -jar i2pinstall.exe -console       (you've already done this)

@ -6,9 +6,9 @@ This will run the installer in text mode, including running the postinstall.sh
 script. After that, you may run 'sh i2prouter start'
 which will start the router and attempt to launch a browser.

-If you do not have an X server running, the browser launch will probably fail, and
+If you do not have an X server running, the browser launch may fail, and
 you may use:
-  lynx http://localhost:7657/index.jsp
+  lynx http://localhost:7657/
 to configure the router.

 If you're having trouble, swing by http://forum.i2p2.de/, check the
@ -24,22 +24,22 @@ edit the files i2prouter (Linux) and wrapper.config (Linux and Windows)
 where there are comments labeled "PORTABLE". Do this before you
 run I2P for the first time.

-To run I2P explicitly:
+To start I2P:
   (*nix): sh i2prouter start
   (win*): I2P.exe
-   (Platforms unsupported by the wrapper - PPC, ARM, etc): sh runplain.sh
+   (non-x86 platforms PPC, ARM, etc): sh runplain.sh

-To stop the router (gracefully):
-   lynx http://localhost:7657/configservice.jsp ("Shutdown gracefully")
+To stop I2P (gracefully):
+   lynx http://localhost:7657/summaryframe (click "Shutdown")

-To stop the router (immediately):
+To stop I2P immediately:
   sh i2prouter stop

 To uninstall I2P:
-   rm -rf $i2pInstallDir
+   rm -rf $I2PInstallDir ~/.i2p

 Supported JVMs:
-  Windows: Latest available from http://java.sun.com/ (1.5+ supported)
-  Linux:   Latest available from http://java.sun.com/ (1.5+ supported)
-  FreeBSD: Sun 1.5-compatible (NIO required)
-  various: http://www.kaffe.org/ Sun 1.5-compatible (NIO required)
+  Windows: Latest available from http://java.com/download (1.5+ supported)
+  Linux:   Latest available from http://java.com/download (1.5+ supported)
+  FreeBSD: 1.5-compatible (NIO required)
+  Other operating systems and JVMs: See http://trac.i2p2.de/wiki/java
--- a/INSTALL.txt
+++ b/INSTALL.txt
@ -1,33 +1,68 @@
 I2P source installation instructions

 Prerequisites to build from source:
-	Java SDK (preferably Sun) 1.5.0 or higher (1.6 recommended)
-	The SDK must have Pack200 support (java.util.jar.Pack200)
+	Java SDK (preferably Oracle/Sun or OpenJDK) 1.6.0 or higher
+          Non-linux operating systems and JVMs: See http://trac.i2p2.de/wiki/java
 	Apache Ant 1.7.0 or higher
-	Optional, For multilanguage support: The xgettext, msgfmt, and msgmerge tools installed
+	The xgettext, msgfmt, and msgmerge tools installed
 	from the GNU gettext package http://www.gnu.org/software/gettext/

 To build and install I2P from source, you must first build
 and package up the appropriate installer by running:

-  ant pkg
+  	ant pkg
+
+On non-x86, use one of the following instead:
+	ant installer-linux
+	ant installer-freebsd
+	ant installer-osx
+


 This will produce a few key files:
 * install.jar:    the GUI and console installer
 * i2pinstall.exe: the GUI and console installer wrapped for cross-platform execution
+                  (only created with ant pkg)
 * i2pupdate.zip:  the update package
+                  (only created with ant pkg)

 From there, you can run the headless (console mode) installer:
  java -jar i2pinstall.exe -console
+or
+  java -jar i2pinstall.jar -console

 Or run the GUI installer:
  java -jar i2pinstall.exe
+or
+  java -jar i2pinstall.jar
+or on Windows, just double-click on i2pinstall.exe.

-Or move the update file into an existing installation directory and restart.
+Or move the i2pupdate.zip file into an existing installation directory and restart.
+
+To start I2P:
+   (*nix): sh i2prouter start
+   (win*): I2P.exe or i2prouter.bat
+   (non-x86 platforms PPC, ARM, etc): sh runplain.sh
+
+To install I2P as a system service:
+   (*nix) sh i2prouter install
+   (win*) install_i2p_service_winnt.bat
+
+To uninstall I2P as a system service:
+   (*nix) sh i2prouter remove
+   (win*) uninstall_i2p-service_winnt.bat
+
+To stop I2P (gracefully):
+   lynx http://localhost:7657/summaryframe (click "Shutdown")
+
+To stop I2P immediately:
+   sh i2prouter stop
+
+To uninstall I2P:
+   rm -rf $I2PInstallDir ~/.i2p

 Supported JVMs:
-  Windows: Latest available from http://java.sun.com/ (1.5+ supported)
-  Linux:   Latest available from http://java.sun.com/ (1.5+ supported)
-  FreeBSD: Sun 1.5-compatible (NIO required)
-  various: http://www.kaffe.org/ Sun 1.5-compatible (NIO required)
+  Windows: Latest available from http://java.com/download (1.5+ supported)
+  Linux:   Latest available from http://java.com/download (1.5+ supported)
+  FreeBSD: 1.5-compatible (NIO required)
+  Other operating systems and JVMs: See http://trac.i2p2.de/wiki/java
--- a/LICENSE.txt
+++ b/LICENSE.txt
@ -2,7 +2,7 @@ This product includes both public domain code and licensed code as described bel
 For all code, unless otherwise stated in the appropriate license, the following applies:


-			    NO WARRANTY
+                            NO WARRANTY

  BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGES.
 LICENSES
 --------

-Core:
+Core (i2p.jar):
 Public domain except as listed below:

   ElGamal and DSA code:
@ -41,8 +41,8 @@ Public domain except as listed below:
   See licenses/LICENSE-SHA256.txt

   AES code:
-   Under the Cryptix (MIT) license, written by the Cryptix team
-   (That's what our website says but all our AES code looks like it is public domain)
+   Copyright (c) 1995-2005 The Cryptix Foundation Limited.
+   See licenses/LICENSE-Cryptix.txt

   Crypto filters:
   From the xlattice app - http://xlattice.sourceforge.net/
@ -56,10 +56,6 @@ Public domain except as listed below:
   Copyright (C) 2001, 2002, Free Software Foundation, Inc.
   See licenses/LICENSE-LGPLv2.1.txt

-   GMP 4.1.3:
-   Copyright 1991, 1996, 1999, 2000 Free Software Foundation, Inc.
-   See licenses/LICENSE-LGPLv2.1.txt
-
   HashCash code:
   Copyright 2006 Gregory Rubin grrubin@gmail.com
   See licenses/LICENSE-HashCash.txt
@ -72,8 +68,12 @@ Public domain except as listed below:
   Contains some code Copyright 2006 Sun Microsystems, Inc.
   See licenses/LICENSE-InstallCert.txt

+   BlockFile:
+   Copyright (c) 2006, Matthew Estes
+   See licenses/LICENSE-BlockFile.txt

-Router:
+
+Router (router.jar):
 Public domain except as listed below:
   UPnP.java:
   From freenet
@ -83,7 +83,7 @@ Public domain except as listed below:
   Copyright (C) 2003-2006 Satoshi Konno
   See licenses/LICENSE-UPnP.txt

-   GeoIP data free to use, courtesy http://ip-to-country.webhosting.info/
+   GeoIP data free to use, courtesy http://www.maxmind.com/


 Installer:
@ -92,34 +92,34 @@ Installer:
   See licenses/LICENSE-Launch4j.txt (in binary packages)
   See installer/lib/launch4j/LICENSE.txt (in source packages)
   The following projects are used by Launch4j...
-	MinGW binutils (http://www.mingw.org/)
+        MinGW binutils (http://www.mingw.org/)

-	Commons BeanUtils (http://jakarta.apache.org/commons/beanutils/)
+        Commons BeanUtils (http://jakarta.apache.org/commons/beanutils/)

- 	Commons Logging (http://jakarta.apache.org/commons/logging/)
-        See licenses/LICENSE-Apache1.1.txt
+        Commons Logging (http://jakarta.apache.org/commons/logging/)
+        See licenses/LICENSE-Apache2.0.txt
        See licenses/NOTICE-Commons-Logging.txt

-	XStream (http://xstream.codehaus.org/)
+        XStream (http://xstream.codehaus.org/)
        Copyright (c) 2003-2004, Joe Walnes
        See licenses/LICENSE-XStream.txt

-	JGoodies Forms (http://www.jgoodies.com/freeware/forms/)
+        JGoodies Forms (http://www.jgoodies.com/freeware/forms/)
        Copyright (c) 2002-2004 JGoodies Karsten Lentzsch. All rights reserved.
        See licenses/LICENSE-JGoodies-Forms.txt

-	JGoodies Looks (http://www.jgoodies.com/freeware/looks/)
+        JGoodies Looks (http://www.jgoodies.com/freeware/looks/)
        Copyright (c) 2003 JGoodies Karsten Lentzsch. All rights reserved.
        See licenses/LICENSE-JGoodies-Looks.txt

-	Foxtrot (http://foxtrot.sourceforge.net/)
+        Foxtrot (http://foxtrot.sourceforge.net/)
        Copyright (c) 2002, Simone Bordet & Marco Cravero. All rights reserved.
        See licenses/LICENSE-Foxtrot.txt

-	Nuvola Icon Theme (http://www.icon-king.com)
+        Nuvola Icon Theme (http://www.icon-king.com)
        See licenses/LICENSE-LGPLv2.1.txt

-	Forms were created using Abeille Forms Designer (https://abeille.dev.java.net/)
+        Forms were created using Abeille Forms Designer (https://abeille.dev.java.net/)

   Izpack 4.3.0:
   Copyright (c) 2001-2008 Julien Ponge
@ -127,11 +127,18 @@ Installer:



-Wrapper 3.1.1:
-   Copyright (c) 1999, 2004 Tanuki Software
+Java Service Wrapper Community Edition 32-bit 3.5.13:
+   Copyright (C) 1999-2011 Tanuki Software, Ltd. All Rights Reserved.
   See licenses/LICENSE-Wrapper.txt


+Jbigi Libraries (jbigi.jar):
+   JNI code public domain.
+
+   GMP 4.3.2 / 5.0.2:
+   Copyright 1991, 1996, 1999, 2000, 2007 Free Software Foundation, Inc.
+   See licenses/LICENSE-LGPLv3.txt
+

 Applications:

@ -141,22 +148,23 @@ Applications:

   BOB:
   Copyright (C) sponge
-   DWTFYWTPL
+   See licenses/COPYING-BOB.txt

   I2PSnark:
   Copyright (C) 2003 Mark J. Wielaard
+   GPLv2 (or any later version)
   See licenses/LICENSE-GPLv2.txt
       Silk icons: See licenses/LICENSE-SilkIcons.txt

   I2PTunnel:
   (c) 2003 - 2004 mihi
-   GPLv2 with exception.
+   GPLv2 (or any later version) with exception.
   See licenses/LICENSE-I2PTunnel.txt
   See licenses/LICENSE-GPLv2.txt

   I2PTunnel SOCKS Proxy:
   Copyright (c) 2004 by human
-   GPLv2 with exception.
+   GPLv2 (or any later version) with exception.
   See licenses/LICENSE-I2PTunnel.txt
   See licenses/LICENSE-GPLv2.txt

@ -164,13 +172,13 @@ Applications:
   By welterde.
   See licenses/LICENSE-GPLv2.txt

-   Jetty 5.1.12:
-   Copyright 2000-2004 Mort Bay Consulting Pty. Ltd.
-   See licenses/LICENSE-Apache1.1.txt
+   Jetty 6.1.26:
+   Copyright 1995-2009 Mort Bay Consulting Pty Ltd
+   See licenses/LICENSE-Jetty.txt
   See licenses/LICENSE-Apache2.0.txt
   See licenses/NOTICE-Commons-Logging.txt

-   JRobin 1.4.0:
+   JRobin 1.5.9.1:
   See licenses/LICENSE-LGPLv2.1.txt

   Ministreaming Lib:
@ -183,13 +191,21 @@ Applications:

   Router console:
   Public domain.
-       Flag icons: public domain, courtesy mjames@gmail.com http://www.famfamfam.com/
+       Flag icons:
+         - Jersey and EU flag icons: public domain, courtesy Xrmap flag
+           collection http://www.arvernes.com/wiki/index.php/Xrmap
+         - Guernsey and Isle of Man flags from the Open Clip Art Library, released into the public domain
+         - All other flag icons: public domain, courtesy mjames@gmail.com http://www.famfamfam.com/
       Silk icons: See licenses/LICENSE-SilkIcons.txt

       GeoIP Data:
-       Copyright (c) 2003 Direct Information Pvt. Ltd. All Rights Reserved.
+       Copyright (c) 2008 MaxMind, Inc.  All Rights Reserved.
       See licenses/LICENSE-GeoIP.txt

+   Router Console and I2PSnark themes:
+   "Man with hat over face" & related images licensed under a Creative Commons 2.0 license.
+   Original photos by Florian Kuhlmann. http://www.flickr.com/photos/floriankuhlmann/3117758155
+
   SAM:
   Public domain.

@ -198,17 +214,27 @@ Applications:

   SusiDNS:
   Copyright (C) 2005 <susi23@mail.i2p>
+   GPLv2 (or any later version)
   See licenses/LICENSE-GPLv2.txt
+       Uses Glassfish Standard Tag Library (JSTL) 1.2:
+       Common Development and Distribution License (CDDL) version 1.0 + GNU General Public License (GPL) version 2
+       See https://glassfish.dev.java.net/public/CDDL+GPL.html
+       See licenses/LICENSE-GPLv2.txt

   SusiMail:
   Copyright (C) 2004-2005  <susi23@mail.i2p>
+   GPLv2 (or any later version)
   See licenses/LICENSE-GPLv2.txt

   Systray:
   Public domain.
-      Bundles systray4j code:
-      See licenses/LICENSE-GPLv2.txt
+      Bundles systray4j-2.4.1:
+      See licenses/LICENSE-LGPLv2.1.txt

+   Tomcat 6.0.35:
+   Copyright 1999-2011 The Apache Software Foundation
+   See licenses/LICENSE-Apache2.0.txt
+   See licenses/NOTICE-Tomcat.txt


 Other Applications and Libraries
@ -220,8 +246,9 @@ distributions. See the source package for the additional license information.
   Admin Manager:
   Public domain

-   Atalk:
-   Public domain
+   BOB Demos:
+   Copyright (C) sponge
+   DWTFYWTPL

   Desktopgui
   Copyright (c) Mathias De Maré
@ -240,7 +267,3 @@ distributions. See the source package for the additional license information.

   SAM Python Library:
   Public domain.
-   
-   I2PSnark/Console themes: 
-   "Man with hat over face" & related images licensed under a Creative Commons 2.0 license.
-   Original photos by Florian Kuhlmann. http://www.flickr.com/photos/floriankuhlmann/3117758155
--- a/README.txt
+++ b/README.txt
@ -1,17 +1,24 @@
 Prerequisites to build from source:
-	Java SDK (preferably Sun) 1.5.0 or higher (1.6 recommended)
-	The SDK must have Pack200 support (java.util.jar.Pack200)
+	Java SDK (preferably Oracle/Sun or OpenJDK) 1.6.0 or higher
+          Non-linux operating systems and JVMs: See http://trac.i2p2.de/wiki/java
 	Apache Ant 1.7.0 or higher
-	Optional, For multilanguage support: The xgettext, msgfmt, and msgmerge tools installed
-	from the GNU gettext package http://www.gnu.org/software/gettext/
+	The xgettext, msgfmt, and msgmerge tools installed
+	  from the GNU gettext package http://www.gnu.org/software/gettext/

 To build:
-	ant pkg
+	On x86 systems do:
+		ant pkg
+
+	On non-x86, use one of the following instead:
+		ant installer-linux
+		ant installer-freebsd
+		ant installer-osx
+
 	Run 'ant' with no arguments to see other build options.
 	See INSTALL.txt or http://www.i2p2.de/download.html for installation instructions.

 Documentation:
-	http://www.i2p2.de/
+	http://www.i2p2.de/how
 	API: run 'ant javadoc' then start at build/javadoc/index.html

 Latest release:
--- a/Slackware/i2p/doinst.sh
+++ b/Slackware/i2p/doinst.sh
@ -26,9 +26,9 @@ for i in *.config ; {

 ( cd $INST_DIR/eepsite
 	if [ -f jetty.xml ] ; then
-		rm jetty.xml.new
+		echo "Please check ${INST_DIR}/eepsite, as there are new files."
 	else
-		mv jetty.xml.new jetty.xml
+		find $PKG/$INSTALL_DIR/i2p -name "*.xml.new" -exec sh -c 'mv "$0" "${0/.new}"' {} \;
 	fi
 )

--- a/Slackware/i2p/i2p.SlackBuild
+++ b/Slackware/i2p/i2p.SlackBuild
@ -18,6 +18,7 @@
 #

 BUILD=1sponge
+# INSTALL_DIR is referenced from /, don't prefix it with a '/'
 INSTALL_DIR=opt
 NAME=i2p
 ARCH=noarch
@ -104,7 +105,10 @@ sed "s|%INSTALL_PATH|/$INSTALL_DIR/i2p|g" runplain.sh > a
 sed "s|%SYSTEM_java_io_tmpdir|/$INSTALL_DIR/i2p|g" a > runplain.sh
 # i2prouter %INSTALL_PATH and %SYSTEM_java_io_tmpdir
 sed "s|%INSTALL_PATH|/$INSTALL_DIR/i2p|g" i2prouter > a
-sed "s|%SYSTEM_java_io_tmpdir|/$INSTALL_DIR/i2p|g" a > i2prouter
+rm i2prouter
+mv a i2prouter
+sed "s|%SYSTEM_java_io_tmpdir|/$INSTALL_DIR/i2p|g" i2prouter > a
+sed "s|#ALLOW_ROOT=true|ALLOW_ROOT=true|g" a > i2prouter

 chmod 744 ./i2prouter
 chmod 744 ./osid
@ -116,7 +120,7 @@ rm -Rf ./lib/*.dll ./*.bat ./*.exe ./installer ./icons ./a postinstall.sh

 mv $PKG/$INSTALL_DIR/i2p/*.config $PKG/install
 mv $PKG/$INSTALL_DIR/i2p/blocklist.txt $PKG/$INSTALL_DIR/i2p/blocklist.txt.new
-mv $PKG/$INSTALL_DIR/i2p/eepsite/jetty.xml $PKG/$INSTALL_DIR/i2p/eepsite/jetty.xml.new
+find $PKG/$INSTALL_DIR/i2p -name "*.xml" -exec mv {} {}.new \;
 mv $PKG/$INSTALL_DIR/i2p/eepsite/docroot/index.html $PKG/$INSTALL_DIR/i2p/eepsite/docroot/index.html.new
 mv $PKG/$INSTALL_DIR/i2p/eepsite/docroot/favicon.ico $PKG/$INSTALL_DIR/i2p/eepsite/docroot/favicon.ico.new
 sed "s|directory|/$INSTALL_DIR/i2p/|g" $CWD/doinst.sh > $PKG/install/doinst.sh
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="net.i2p.router"
-      android:versionCode="1"
-      android:versionName="1.0.0">
-    <uses-permission android:name="android.permission.INTERNET" />
-    <!-- 3 = 1.5, 2 = 1.1, 1 = 1.0; would probably work with 1 but don't have a 1.0 SDK to test against -->
-    <uses-sdk android:minSdkVersion="2" />
-    <application android:label="@string/app_name">
-        <activity android:name=".I2PAndroid"
-                  android:label="@string/app_name"
-                  android:launchMode="singleTask" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest> 
--- a/android/README.txt
+++ b/android/README.txt
@ -1,38 +0,0 @@
-These instructions are for a recent Android SDK (1.6 or later)..
-Should also still work with a 1.5 SDK.
-The build file is not compatible with the 1.1 SDK any more.
-
-#Download the SDK from http://developer.android.com/sdk/index.html
-#Unzip the android SDK in ../../
-#So then the android tools will be in ../../android-sdk-linux_86/tools/
-#
-# now go to the available packages tab, check the box and click refresh,
-# and download an SDK Platform
-# Since I2P is configured to run on 1.1 or higher
-# (API 2) download that one. Otherwise you must change the
-# target in default.properties from android-2 to andriod-x
-# where x is the API version.
-
-# create a file local.properties with the following line:
-# sdk-location=/path/to/your/android-sdk-linux_86
-
-#then build the android apk file:
-ant debug
-
-# Create the android 1.1 (API 2) virtual device
-# (don't make a custom hardware profile)
-# A AVD created with the 1.5 SDK will not work with the newer tools
-../../android-sdk-linux_86/tools/android create avd --name i2p --target 2
-
-#then run the emulator:
-../../android-sdk-linux_86/tools/emulator -avd i2p &
-
-#then wait a couple minutes until the emulator is up
-#then install the I2P app
-ant install
-
-#then run the debugger
-../../android-sdk-linux_86/tools/ddms &
-
-#to rebuild and reinstall to emulator:
-ant reinstall
--- a/android/build.xml
+++ b/android/build.xml
@ -1,356 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name=".I2PAndroid" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contain the path to the SDK. It should *NOT* be checked in in Version
-         Control Systems. -->
-    <property file="local.properties"/>
-
-    <!-- The build.properties file can be created by you and is never touched
-         by the 'android' tool. This is the place to change some of the default property values
-         used by the Ant rules.
-         Here are some properties you may want to change/update:
-
-         application-package
-             the name of your application package as defined in the manifest. Used by the
-             'uninstall' rule.
-         source-folder
-             the name of the source folder. Default is 'src'.
-         out-folder
-             the name of the output folder. Default is 'bin'.
-
-         Properties related to the SDK location or the project target should be updated
-          using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your application and
-         should be checked in in Version Control Systems.
-
-         -->
-    <property file="build.properties"/>
-
-    <!-- The default.properties file is created and updated by the 'android' tool, as well
-         as ADT. 
-         This file is an integral part of the build system for your application and
-         should be checked in in Version Control Systems. -->
-    <property file="default.properties"/>
-
-    <!-- Custom Android task to deal with the project target, and import the proper rules.
-         This requires ant 1.6.0 or above. -->
-    <path id="android.antlibs">
-        <pathelement path="${sdk-location}/tools/lib/anttasks.jar" />
-        <pathelement path="${sdk-location}/tools/lib/sdklib.jar" />
-        <pathelement path="${sdk-location}/tools/lib/androidprefs.jar" />
-        <pathelement path="${sdk-location}/tools/lib/apkbuilder.jar" />
-        <pathelement path="${sdk-location}/tools/lib/jarutils.jar" />
-    </path>
-
-    <taskdef name="setup"
-        classname="com.android.ant.SetupTask"
-        classpathref="android.antlibs"/>
-
-    <!-- Execute the Android Setup task that will setup some properties specific to the target,
-         and import the rules files.
-         To customize the rules, copy/paste them below the task, and disable import by setting
-         the import attribute to false:
-            <setup import="false" />
-         
-         This will ensure that the properties are setup correctly but that your customized
-         targets are used.
-    -->
-    <setup import="false" />
-
-    <!--
-         ================================================================================
-         New I2P rules
-         ================================================================================
-    -->
-
-    <target name="buildrouter" depends="dirs" >
-        <!-- build router and core -->
-        <ant dir=".." target="buildrouter" />
-
-        <!-- router -->
-        <copy file="../build/router.jar" todir="${external-libs-folder}" />
-
-        <!-- core -->
-        <mkdir dir="tmp" />
-        <unjar src="../build/i2p.jar" dest="tmp/" />
-        <delete file="tmp/net/i2p/util/LogWriter.class" />
-        <!-- org.bouncycastle.crypto already in android
-             but we need a little trickery because our HMac is incompatible...
-             and the libs aren't in the SDK to compile against??? -->
-        <jar destfile="${external-libs-folder}/crypto.jar" >
-            <fileset dir="tmp/" >
-                <include name="org/bouncycastle/crypto/Digest.class" />
-                <include name="org/bouncycastle/crypto/Mac.class" />
-                <include name="org/bouncycastle/crypto/digests/GeneralDigest.class" />
-                <include name="org/bouncycastle/crypto/digests/MD5Digest.class" />
-            </fileset>
-        </jar>
-        <delete>
-            <fileset dir="tmp/" >
-                <include name="org/bouncycastle/crypto/Digest.class" />
-                <include name="org/bouncycastle/crypto/Mac.class" />
-                <include name="org/bouncycastle/crypto/digests/GeneralDigest.class" />
-                <include name="org/bouncycastle/crypto/digests/MD5Digest.class" />
-            </fileset>
-        </delete>
-<!--
-        <delete dir="tmp/org/bouncycastle/" />
-        <delete file="tmp/net/i2p/crypto/HMACGenerator.class" />
-->
-        <delete file="tmp/org/bouncycastle/" />
-        <!-- lots of unneeded stuff could be deleted here -->
-        <jar destfile="${external-libs-folder}/i2p.jar" basedir="tmp/" />
-
-        <!-- some resources -->
-        <mkdir dir="res/drawable/" />
-        <copy file="../installer/resources/themes/console/images/i2plogo.png" todir="res/drawable/" />
-        <copy file="../installer/resources/blocklist.txt" tofile="res/raw/blocklist_txt" />
-    </target>
-
-    <target name="hackcleanup">
-        <delete file="${external-libs-folder}/crypto.jar" />
-    </target>
-
-    <!-- fix for property name change sometime after SDK 1.5 -->
-    <property name="android-jar" value="${android.jar}" />
-    <property name="android-aidl" value="${android.aidl}" />
-
-    <!--
-         ================================================================================
-         From here down copied from SDK platforms/android-1.1/templates/android_rules.xml
-         and then modified
-         ================================================================================
-    -->
-
-    <!--
-        This rules file is meant to be imported by the custom Ant task:
-            com.android.ant.AndroidInitTask
-
-        The following properties are put in place by the importing task:
-            android-jar, android-aidl, aapt, aidl, and dx
-
-        Additionnaly, the task sets up the following classpath reference:
-            android.target.classpath
-        This is used by the compiler task as the boot classpath.
-    -->
-
-    <!-- Custom tasks -->
-    <taskdef name="aaptexec"
-        classname="com.android.ant.AaptExecLoopTask"
-        classpathref="android.antlibs"/>
-
-    <taskdef name="apkbuilder"
-        classname="com.android.ant.ApkBuilderTask"
-        classpathref="android.antlibs"/>
-
-    <!-- Properties -->
-
-    <property name="android-tools" value="${sdk-location}/tools" />
-
-    <!-- Input directories -->
-    <property name="source-folder" value="src" />
-    <property name="gen-folder" value="gen" />
-    <property name="resource-folder" value="res" />
-    <property name="asset-folder" value="assets" />
-    <property name="source-location" value="${basedir}/${source-folder}" />
-
-    <!-- folder for the 3rd party java libraries -->
-    <property name="external-libs-folder" value="libs" />
-
-    <!-- folder for the native libraries -->
-    <property name="native-libs-folder" value="libs" />
-
-    <!-- Output directories -->
-    <property name="gen-folder" value="gen" />
-    <property name="out-folder" value="bin" />
-    <property name="out-classes" value="${out-folder}/classes" />
-    <property name="out-classes-location" value="${basedir}/${out-classes}"/>
-    <!-- out folders for a parent project if this project is an instrumentation project -->
-    <property name="main-out-folder" value="../${out-folder}" />
-    <property name="main-out-classes" value="${main-out-folder}/classes"/>
-
-    <!-- Intermediate files -->
-    <property name="dex-file" value="classes.dex" />
-    <property name="intermediate-dex" value="${out-folder}/${dex-file}" />
-    <!-- dx does not properly support incorrect / or \ based on the platform
-         and Ant cannot convert them because the parameter is not a valid path.
-         Because of this we have to compute different paths depending on the platform. -->
-    <condition property="intermediate-dex-location"
-            value="${basedir}\${intermediate-dex}"
-            else="${basedir}/${intermediate-dex}" >
-        <os family="windows"/>
-    </condition>
-
-    <!-- The final package file to generate -->
-    <property name="out-debug-package" value="${out-folder}/${ant.project.name}-debug.apk"/>
-
-    <!-- Tools -->
-    <condition property="exe" value=".exe" else=""><os family="windows"/></condition>
-    <property name="adb" value="${android-tools}/adb${exe}"/>
-
-    <!-- rules -->
-
-    <!-- Create the output directories if they don't exist yet. -->
-    <target name="dirs">
-        <echo>Creating output directories if needed...</echo>
-        <mkdir dir="${resource-folder}" />
-        <mkdir dir="${external-libs-folder}" />
-        <mkdir dir="${gen-folder}" />
-        <mkdir dir="${out-folder}" />
-        <mkdir dir="${out-classes}" />
-    </target>
-
-    <!-- Generate the R.java file for this project's resources. -->
-    <target name="resource-src" depends="dirs">
-        <echo>Generating R.java / Manifest.java from the resources...</echo>
-        <exec executable="${aapt}" failonerror="true">
-            <arg value="package" />
-            <arg value="-m" />
-            <arg value="-J" />
-            <arg path="${gen-folder}" />
-            <arg value="-M" />
-            <arg path="AndroidManifest.xml" />
-            <arg value="-S" />
-            <arg path="${resource-folder}" />
-            <arg value="-I" />
-            <arg path="${android-jar}" />
-        </exec>
-    </target>
-
-    <!-- Generate java classes from .aidl files. -->
-    <target name="aidl" depends="dirs">
-        <echo>Compiling aidl files into Java classes...</echo>
-        <apply executable="${aidl}" failonerror="true">
-            <arg value="-p${android-aidl}" />
-            <arg value="-I${source-folder}" />
-            <arg value="-o${gen-folder}" />
-            <fileset dir="${source-folder}">
-                <include name="**/*.aidl"/>
-            </fileset>
-        </apply>
-    </target>
-
-    <!-- Compile this project's .java files into .class files. -->
-    <!-- I2P add buildrouter -->
-    <target name="compile" depends="buildrouter, resource-src, aidl">
-        <javac encoding="ascii" target="1.5" debug="true" extdirs=""
-                destdir="${out-classes}"
-                bootclasspathref="android.target.classpath">
-            <src path="${source-folder}" />
-            <src path="${gen-folder}" />
-            <classpath>
-                <fileset dir="${external-libs-folder}" includes="*.jar"/>
-                <pathelement path="${main-out-classes}"/>
-            </classpath>
-         </javac>
-    </target>
-
-    <!-- Convert this project's .class files into .dex files. -->
-    <!-- I2P add hackcleanup -->
-    <target name="dex" depends="compile, hackcleanup">
-        <echo>Converting compiled files and external libraries into ${out-folder}/${dex-file}...</echo>
-        <apply executable="${dx}" failonerror="true" parallel="true">
-            <!-- I2P this is a bad sign that we need this -->
-            <arg value="-JXmx256m" />
-            <arg value="--dex" />
-            <arg value="--output=${intermediate-dex-location}" />
-            <arg path="${out-classes-location}" />
-            <fileset dir="${external-libs-folder}" includes="*.jar"/>
-        </apply>
-    </target>
-
-    <!-- Put the project's resources into the output package file
-         This actually can create multiple resource package in case
-         Some custom apk with specific configuration have been
-         declared in default.properties.
-         -->
-    <target name="package-resources">
-        <echo>Packaging resources</echo>
-        <aaptexec executable="${aapt}"
-                command="package"
-                manifest="AndroidManifest.xml"
-                resources="${resource-folder}"
-                assets="${asset-folder}"
-                androidjar="${android-jar}"
-                outfolder="${out-folder}"
-                basename="${ant.project.name}" />
-    </target>
-
-    <!-- Package the application and sign it with a debug key.
-         This is the default target when building. It is used for debug. -->
-    <target name="debug" depends="dex, package-resources">
-        <apkbuilder
-                outfolder="${out-folder}"
-                basename="${ant.project.name}"
-                signed="true"
-                verbose="false">
-            <file path="${intermediate-dex}" />
-            <sourcefolder path="${source-folder}" />
-            <jarfolder path="${external-libs-folder}" />
-            <nativefolder path="${native-libs-folder}" />
-        </apkbuilder>
-    </target>
-
-    <!-- Package the application without signing it.
-         This allows for the application to be signed later with an official publishing key. -->
-    <target name="release" depends="dex, package-resources">
-        <apkbuilder
-                outfolder="${out-folder}"
-                basename="${ant.project.name}"
-                signed="false"
-                verbose="false">
-            <file path="${intermediate-dex}" />
-            <sourcefolder path="${source-folder}" />
-            <jarfolder path="${external-libs-folder}" />
-            <nativefolder path="${native-libs-folder}" />
-        </apkbuilder>
-        <echo>All generated packages need to be signed with jarsigner before they are published.</echo>
-    </target>
-
-    <!-- Install the package on the default emulator -->
-    <target name="install" depends="debug">
-        <echo>Installing ${out-debug-package} onto default emulator...</echo>
-        <exec executable="${adb}" failonerror="true">
-            <arg value="install" />
-            <arg path="${out-debug-package}" />
-        </exec>
-    </target>
-
-    <target name="reinstall" depends="debug">
-        <echo>Installing ${out-debug-package} onto default emulator...</echo>
-        <exec executable="${adb}" failonerror="true">
-            <arg value="install" />
-            <arg value="-r" />
-            <arg path="${out-debug-package}" />
-        </exec>
-    </target>
-
-    <!-- Uinstall the package from the default emulator -->
-    <target name="uninstall">
-        <echo>Uninstalling ${application-package} from the default emulator...</echo>
-        <exec executable="${adb}" failonerror="true">
-            <arg value="uninstall" />
-            <arg path="${application-package}" />
-        </exec>
-    </target>
-    
-    <target name="help">
-        <!-- displays starts at col 13
-              |13                                                              80| -->
-        <echo>Android Ant Build. Available targets:</echo>
-        <echo>   help:      Displays this help.</echo>
-        <echo>   debug:     Builds the application and sign it with a debug key.</echo>
-        <echo>   release:   Builds the application. The generated apk file must be</echo>
-        <echo>              signed before it is published.</echo>
-        <echo>   install:   Installs the debug package onto a running emulator or</echo>
-        <echo>              device. This can only be used if the application has </echo>
-        <echo>              not yet been installed.</echo>
-        <echo>   reinstall: Installs the debug package on a running emulator or</echo>
-        <echo>              device that already has the application.</echo>
-        <echo>              The signatures must match.</echo>
-        <echo>   uninstall: uninstall the application from a running emulator or</echo>
-        <echo>              device.</echo>
-    </target>
-</project>
--- a/android/default.properties
+++ b/android/default.properties
@ -1,11 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-# 
-# This file must be checked in Version Control Systems.
-# 
-# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-2
--- a/android/res/layout/main.xml
+++ b/android/res/layout/main.xml
@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-<TextView  
-    android:layout_width="fill_parent" 
-    android:layout_height="wrap_content" 
-    android:text="Hello World, I2PAndroid"
-    />
-<ImageView  
-    android:layout_width="fill_parent" 
-    android:layout_height="wrap_content" 
-    android:src="@drawable/i2plogo"
-    />
-</LinearLayout>
-
--- a/android/res/raw/logger_config
+++ b/android/res/raw/logger_config
@ -1,3 +0,0 @@
-logger.defaultLevel=INFO
-logger.record.net.i2p.router.transport.FIFOBandwidthRefiller=ERROR
-logger.record.net.i2p.stat.Rate=ERROR
--- a/android/res/raw/router_config
+++ b/android/res/raw/router_config
@ -1,22 +0,0 @@
-# initial router.config
-# temp directory
-i2p.dir.temp=/data/data/net.i2p.router/files/tmp
-i2p.dir.pid=/data/data/net.i2p.router/files/tmp
-# save memory
-prng.buffers=2
-router.decayingBloomFilterM=20
-stat.full=false
-i2np.udp.maxConnections=30
-# no I2CP
-i2p.dummyClientFacade=true
-# for now
-#i2np.ntcp.enable=false
-#
-# UDP crashes the JVM, don't know why
-#
-i2np.udp.enable=false
-# no COMM at all!!!
-#i2p.vmCommSystem=true
-# not on android
-i2np.upnp.enable=false
-routerconsole.geoip.enable=false
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">I2PAndroid</string>
-</resources>
--- a/android/src/net/i2p/router/I2PAndroid.java
+++ b/android/src/net/i2p/router/I2PAndroid.java
@ -1,142 +0,0 @@
-package net.i2p.router;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.res.Resources;
-import android.content.res.Resources.NotFoundException;
-import android.os.Bundle;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.util.List;
-
-import net.i2p.router.Router;
-import net.i2p.router.RouterLaunch;
-// import net.i2p.util.NativeBigInteger;
-
-public class I2PAndroid extends Activity
-{
-    static Context _context;
-    private static final String DIR = "/data/data/net.i2p.router/files";
-
-    /** Called when the activity is first created. */
-    @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
-
-        _context = this;  // Activity extends Context
-        debugStuff();
-        initialize();
-        // 300ms per run
-        // 5x slower than java on my server and 50x slower than native on my server
-        // NativeBigInteger.main(null);
-    }
-
-    public void onRestart()
-    {
-        System.err.println("onRestart called");
-        super.onRestart();
-    }
-
-    public void onStart()
-    {
-        System.err.println("onStart called");
-        super.onStart();
-        RouterLaunch.main(null);
-        System.err.println("Router.main finished");
-    }
-
-    public void onResume()
-    {
-        System.err.println("onResume called");
-        super.onResume();
-    }
-
-    public void onPause()
-    {
-        System.err.println("onPause called");
-        super.onPause();
-    }
-
-    public void onStop()
-    {
-        System.err.println("onStop called");
-        super.onStop();
-
-        // from routerconsole ContextHelper
-        List contexts = RouterContext.listContexts();
-        if ( (contexts == null) || (contexts.isEmpty()) ) 
-            throw new IllegalStateException("No contexts. This is usually because the router is either starting up or shutting down.");
-        RouterContext ctx = (RouterContext)contexts.get(0);
-
-        // shutdown() doesn't return so use shutdownGracefully()
-        ctx.router().shutdownGracefully(Router.EXIT_HARD);
-        System.err.println("shutdown complete");
-    }
-
-    public void onDestroy()
-    {
-        System.err.println("onDestroy called");
-        super.onDestroy();
-    }
-
-    public static Context getContext() {
-        return _context;
-    }
-
-    private void debugStuff() {
-        System.err.println("java.io.tmpdir" + ": " + System.getProperty("java.io.tmpdir"));
-        System.err.println("java.vendor" + ": " + System.getProperty("java.vendor"));
-        System.err.println("java.version" + ": " + System.getProperty("java.version"));
-        System.err.println("os.arch" + ": " + System.getProperty("os.arch"));
-        System.err.println("os.name" + ": " + System.getProperty("os.name"));
-        System.err.println("os.version" + ": " + System.getProperty("os.version"));
-        System.err.println("user.dir" + ": " + System.getProperty("user.dir"));
-        System.err.println("user.home" + ": " + System.getProperty("user.home"));
-        System.err.println("user.name" + ": " + System.getProperty("user.name"));
-    }
-
-    private void initialize() {
-        // Until we can edit the router.config on the device,
-        // copy it from the resource every time.
-        // File f = new I2PFile("router.config");
-        // if (!f.exists()) {
-            copyResourceToFile(R.raw.router_config, "router.config");
-            copyResourceToFile(R.raw.logger_config, "logger.config");
-            copyResourceToFile(R.raw.blocklist_txt, "blocklist.txt");
-        // }
-
-        // Set up the locations so Router and WorkingDir can find them
-        System.setProperty("i2p.dir.base", DIR);
-        System.setProperty("i2p.dir.config", DIR);
-        System.setProperty("wrapper.logfile", DIR + "/wrapper.log");
-    }
-
-    private void copyResourceToFile(int resID, String f) {
-        InputStream in = null;
-        FileOutputStream out = null;
-
-        System.err.println("Creating file " + f + " from resource");
-        byte buf[] = new byte[4096];
-        try {
-            // Context methods
-            in = getResources().openRawResource(resID);
-            out = openFileOutput(f, 0);
-            
-            int read = 0;
-            while ( (read = in.read(buf)) != -1)
-                out.write(buf, 0, read);
-            
-        } catch (IOException ioe) {
-        } catch (Resources.NotFoundException nfe) {
-        } finally {
-            if (in != null) try { in.close(); } catch (IOException ioe) {}
-            if (out != null) try { out.close(); } catch (IOException ioe) {}
-        }
-    }
-    
-}
--- a/android/src/net/i2p/util/LogWriter.java
+++ b/android/src/net/i2p/util/LogWriter.java
@ -1,163 +0,0 @@
-package net.i2p.util;
-
-/*
- * public domain
- *
- */
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.List;
-
-/**
- * bridge to android logging
- *
- * @author zzz
- */
-class LogWriter implements Runnable {
-    private final static long CONFIG_READ_ITERVAL = 10 * 1000;
-    private long _lastReadConfig = 0;
-    private long _numBytesInCurrentFile = 0;
-    private OutputStream _currentOut; // = System.out
-    private int _rotationNum = -1;
-    private String _logFilenamePattern;
-    private File _currentFile;
-    private LogManager _manager;
-
-    private boolean _write;
-    
-    private LogWriter() { // nop
-    }
-
-    public LogWriter(LogManager manager) {
-        _manager = manager;
-    }
-
-    public void stopWriting() {
-        _write = false;
-    }
-    
-    public void run() {
-        _write = true;
-        try {
-            while (_write) {
-                flushRecords();
-                rereadConfig();
-            }
-            System.err.println("Done writing");
-        } catch (Exception e) {
-            System.err.println("Error writing the logs: " + e.getMessage());
-            e.printStackTrace();
-        }
-    }
-
-    public void flushRecords() { flushRecords(true); }
-    public void flushRecords(boolean shouldWait) {
-        try {
-            List records = _manager._removeAll();
-            if (records == null) return;
-            for (int i = 0; i < records.size(); i++) {
-                LogRecord rec = (LogRecord) records.get(i);
-                writeRecord(rec);
-            }
-        } catch (Throwable t) {
-            t.printStackTrace();
-        } finally {
-            if (shouldWait) {
-                try { 
-                    synchronized (this) {
-                        this.wait(10*1000); 
-                    }
-                } catch (InterruptedException ie) { // nop
-                }
-            }
-        }
-    }
-
-    public String currentFile() {
-        return _currentFile != null ? _currentFile.getAbsolutePath() : "uninitialized";
-    }
-    
-    private void rereadConfig() {
-        long now = Clock.getInstance().now();
-        if (now - _lastReadConfig > CONFIG_READ_ITERVAL) {
-            _manager.rereadConfig();
-            _lastReadConfig = now;
-        }
-    }
-
-    private void writeRecord(LogRecord rec) {
-        if (rec.getThrowable() == null)
-            log(rec.getPriority(), rec.getSource(), rec.getSourceName(), rec.getThreadName(), rec.getMessage());
-        else
-            log(rec.getPriority(), rec.getSource(), rec.getSourceName(), rec.getThreadName(), rec.getMessage(), rec.getThrowable());
-    }
-
-    public void log(int priority, Class src, String name, String threadName, String msg) {
-            if (src != null) {
-                String tag = src.getName();
-                int dot = tag.lastIndexOf(".");
-                if (dot >= 0)
-                    tag = tag.substring(dot + 1);
-                android.util.Log.println(toAndroidLevel(priority),
-                                         tag,
-                                         '[' + threadName + "] " + msg);
-            } else if (name != null)
-                android.util.Log.println(toAndroidLevel(priority),
-                                         name,
-                                         '[' + threadName + "] " + msg);
-            else
-                android.util.Log.println(toAndroidLevel(priority),
-                                         threadName, msg);
-    }
-
-    public void log(int priority, Class src, String name, String threadName, String msg, Throwable t) {
-            if (src != null) {
-                String tag = src.getName();
-                int dot = tag.lastIndexOf(".");
-                if (dot >= 0)
-                    tag = tag.substring(dot + 1);
-                android.util.Log.println(toAndroidLevel(priority),
-                                         tag,
-                                         '[' + threadName + "] " + msg +
-                                         ' ' + t.toString() + ' ' + android.util.Log.getStackTraceString(t));
-            } else if (name != null)
-                android.util.Log.println(toAndroidLevel(priority),
-                                         name,
-                                         '[' + threadName + "] " + msg +
-                                         ' ' + t.toString() + ' ' + android.util.Log.getStackTraceString(t));
-            else
-                android.util.Log.println(toAndroidLevel(priority),
-                                         threadName,
-                                         msg + ' ' + t.toString() + ' ' + android.util.Log.getStackTraceString(t));
-    }
-
-    private static int toAndroidLevel(int level) {
-        switch (level) {
-        case Log.DEBUG:
-            return android.util.Log.DEBUG;
-        case Log.INFO:
-            return android.util.Log.INFO;
-        case Log.WARN:
-            return android.util.Log.WARN;
-        case Log.ERROR:
-        case Log.CRIT:
-        default:
-            return android.util.Log.ERROR;
-        }
-    }
-
-    private static final String replace(String pattern, int num) {
-        char c[] = pattern.toCharArray();
-        StringBuffer buf = new StringBuffer();
-        for (int i = 0; i < c.length; i++) {
-            if ( (c[i] != '#') && (c[i] != '@') )
-                buf.append(c[i]);
-            else
-                buf.append(num);
-        }
-        return buf.toString();
-    }
-}
--- a/apps/BOB/build.xml
+++ b/apps/BOB/build.xml
@ -71,6 +71,7 @@
    nbproject/build-impl.xml file. 

    -->
+
    <target depends="jar" description="Build BOB into a SINGLE JAR." name="onejar">
 	<!-- Make needed working dirs -->
 	<mkdir dir="${dist.dir}/lib" />
--- a/apps/BOB/nbproject/project.properties
+++ b/apps/BOB/nbproject/project.properties
@ -26,7 +26,7 @@ dist.dir=dist
 dist.jar=${dist.dir}/BOB.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
-excludes=
+excludes=**/*.html,**/*.txt
 file.reference.build-javadoc=../../i2p.i2p/build/javadoc
 file.reference.i2p.jar=../../core/java/build/i2p.jar
 file.reference.i2ptunnel.jar=../i2ptunnel/java/build/i2ptunnel.jar
--- a/apps/BOB/src/net/i2p/BOB/BOB.java
+++ b/apps/BOB/src/net/i2p/BOB/BOB.java
@ -38,7 +38,6 @@ import java.util.concurrent.atomic.AtomicBoolean;

 import net.i2p.I2PAppContext;
 import net.i2p.client.I2PClient;
-import net.i2p.client.streaming.RetransmissionTimer;
 import net.i2p.util.Log;
 import net.i2p.util.SimpleScheduler;
 import net.i2p.util.SimpleTimer2;
@ -182,10 +181,8 @@ public class BOB {
 		// Re-reading the config file in each thread is pretty damn stupid.
 		String configLocation = System.getProperty(PROP_CONFIG_LOCATION, "bob.config");
 		// This is here just to ensure there is no interference with our threadgroups.
-		RetransmissionTimer Y = RetransmissionTimer.getInstance();
 		SimpleScheduler Y1 = SimpleScheduler.getInstance();
 		SimpleTimer2 Y2 = SimpleTimer2.getInstance();
-		i = Y.hashCode();
 		i = Y1.hashCode();
 		i = Y2.hashCode();
 		try {
--- a/apps/BOB/src/net/i2p/BOB/DoCMDS.java
+++ b/apps/BOB/src/net/i2p/BOB/DoCMDS.java
@ -29,6 +29,7 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
 import java.net.Socket;
+import java.util.Locale;
 import java.util.Properties;
 import java.util.StringTokenizer;
 import java.util.concurrent.atomic.AtomicBoolean;
@ -399,7 +400,7 @@ public class DoCMDS implements Runnable {
 	 */
 	private boolean is64ok(String data) {
 		try {
-			Destination x = new Destination(data);
+			new Destination(data);
 			return true;
 		} catch (Exception e) {
 			return false;
@ -434,7 +435,7 @@ public class DoCMDS implements Runnable {
 							if (token.countTokens() != 0) {
 								Command = token.nextToken();
 								Command =
-									Command.toLowerCase();
+									Command.toLowerCase(Locale.US);
 								if (token.countTokens() != 0) {
 									Arg = token.nextToken();
 								} else {
--- a/apps/BOB/src/net/i2p/BOB/Main.java
+++ b/apps/BOB/src/net/i2p/BOB/Main.java
@ -23,7 +23,6 @@
 */
 package net.i2p.BOB;

-import net.i2p.client.streaming.RetransmissionTimer;
 import net.i2p.util.SimpleScheduler;
 import net.i2p.util.SimpleTimer2;

@ -40,7 +39,6 @@ public class Main {
 	 */
 	public static void main(String[] args) {
 		// THINK THINK THINK THINK THINK THINK
-		RetransmissionTimer Y = RetransmissionTimer.getInstance();
 		SimpleScheduler Y1 = SimpleScheduler.getInstance();
 		SimpleTimer2 Y2 = SimpleTimer2.getInstance();

@ -48,6 +46,5 @@ public class Main {

 		Y2.stop();
 		Y1.stop();
-		Y.stop();
 	}
 }
--- a/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java
+++ b/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java
@ -30,6 +30,7 @@ import java.io.OutputStream;
 import java.net.ConnectException;
 import java.net.NoRouteToHostException;
 import java.net.Socket;
+import java.util.Locale;
 import java.util.concurrent.atomic.AtomicBoolean;
 import net.i2p.I2PException;
 import net.i2p.client.streaming.I2PSocket;
@ -144,7 +145,7 @@ public class TCPtoI2P implements Runnable {
 				in = sock.getInputStream();
 				out = sock.getOutputStream();
 				line = lnRead(in);
-				input = line.toLowerCase();
+				input = line.toLowerCase(Locale.US);
 				Destination dest = null;
 				if (input.endsWith(".i2p")) {
 					//dest = I2PTunnel.destFromName(input);
--- a/apps/addressbook/build.xml
+++ b/apps/addressbook/build.xml
@ -51,8 +51,12 @@
        <!-- unused for now, as we oddly ship addressbook as a .war -->
 	<target name="jar" depends="compile, changes">
 		<jar basedir="${build}" destfile="${dist}/${jar}">
+		<!-- set if unset -->
+		<property name="workspace.changes" value="" />
 			<manifest>
 				<attribute name="Main-Class" value="addressbook.Daemon"/>
+				<attribute name="Implementation-Version" value="${full.version}" />
+				<attribute name="Built-By" value="${build.built-by}" />
 		                <attribute name="Build-Date" value="${build.timestamp}" />
 		                <attribute name="Base-Revision" value="${workspace.version}" />
 		                <attribute name="Workspace-Changes" value="${workspace.changes}" />
@ -67,8 +71,12 @@
 		<copy todir="${dist}/tmp/WEB-INF/classes">
 			<fileset dir="${build}"/>
 		</copy>
+		<!-- set if unset -->
+		<property name="workspace.changes.tr" value="" />
 		<war basedir="${dist}/tmp" webxml="web.xml" destfile="${dist}/${war}">
 			<manifest>
+				<attribute name="Implementation-Version" value="${full.version}" />
+				<attribute name="Built-By" value="${build.built-by}" />
 		                <attribute name="Build-Date" value="${build.timestamp}" />
 		                <attribute name="Base-Revision" value="${workspace.version}" />
 		                <attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
@ -81,9 +89,17 @@
 	        <uptodate property="war.uptodate" targetfile="${dist}/${war}">
 		            <srcfiles dir= "." includes="${build}/**/*.class, web.xml"/>
 	        </uptodate>
+                <condition property="shouldListChanges" >
+                    <and>
+                        <not>
+                            <isset property="war.uptodate" />
+                        </not>
+                        <isset property="mtn.available" />
+                    </and>
+                </condition>
 	</target>

-	<target name="changes">
+	<target name="changes" depends="warUpToDate" if="shouldListChanges" >
 	        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
 	            <arg value="list" />
 	            <arg value="changed" />
--- a/apps/addressbook/java/src/net/i2p/addressbook/AddressBook.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/AddressBook.java
@ -23,12 +23,14 @@ package net.i2p.addressbook;

 import java.io.File;
 import java.io.IOException;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;

 import net.i2p.I2PAppContext;
 import net.i2p.util.EepGet;
+import net.i2p.util.SecureFile;

 /**
 * An address book for storing human readable names mapped to base64 i2p
@ -40,11 +42,12 @@ import net.i2p.util.EepGet;
 */
 class AddressBook {

-    private String location;
-
-    private Map addresses;
-
+    private final String location;
+    /** either addresses or subFile will be non-null, but not both */
+    private final Map<String, String> addresses;
+    private final File subFile;
    private boolean modified;
+    private static final boolean DEBUG = false;

    /**
     * Construct an AddressBook from the contents of the Map addresses.
@ -53,8 +56,10 @@ class AddressBook {
     *            A Map containing human readable addresses as keys, mapped to
     *            base64 i2p destinations.
     */
-    public AddressBook(Map addresses) {
+    public AddressBook(Map<String, String> addresses) {
        this.addresses = addresses;
+        this.subFile = null;
+        this.location = null;
    }

    /*
@ -82,6 +87,7 @@ class AddressBook {
    }
 */
    static final long MAX_SUB_SIZE = 3 * 1024 * 1024l; //about 5,000 hosts
+
    /**
     * Construct an AddressBook from the Subscription subscription. If the
     * address book at subscription has not changed since the last time it was
@ -90,33 +96,46 @@ class AddressBook {
     * 
     * Yes, the EepGet fetch() is done in this constructor.
     * 
+     * This stores the subscription in a temporary file and does not read the whole thing into memory.
+     * An AddressBook created with this constructor may not be modified or written using write().
+     * It may be a merge source (an parameter for another AddressBook's merge())
+     * but may not be a merge target (this.merge() will throw an exception).
+     * 
     * @param subscription
     *            A Subscription instance pointing at a remote address book.
     * @param proxyHost hostname of proxy
     * @param proxyPort port number of proxy
     */
    public AddressBook(Subscription subscription, String proxyHost, int proxyPort) {
-        File tmp = new File(I2PAppContext.getGlobalContext().getTempDir(), "addressbook.tmp");
+        Map<String, String> a = null;
+        File subf = null;
+        try {
+            File tmp = SecureFile.createTempFile("addressbook", null, I2PAppContext.getGlobalContext().getTempDir());
+            EepGet get = new EepGet(I2PAppContext.getGlobalContext(), true,
+                    proxyHost, proxyPort, 0, -1l, MAX_SUB_SIZE, tmp.getAbsolutePath(), null,
+                    subscription.getLocation(), true, subscription.getEtag(), subscription.getLastModified(), null);
+            if (get.fetch()) {
+                subscription.setEtag(get.getETag());
+                subscription.setLastModified(get.getLastModified());
+                subscription.setLastFetched(I2PAppContext.getGlobalContext().clock().now());
+                subf = tmp;
+            } else {
+                a = Collections.EMPTY_MAP;
+                tmp.delete();
+            }
+        } catch (IOException ioe) {
+            a = Collections.EMPTY_MAP;
+        }
+        this.addresses = a;
+        this.subFile = subf;
        this.location = subscription.getLocation();
-        EepGet get = new EepGet(I2PAppContext.getGlobalContext(), true,
-                proxyHost, proxyPort, 0, -1l, MAX_SUB_SIZE, tmp.getAbsolutePath(), null,
-                subscription.getLocation(), true, subscription.getEtag(), subscription.getLastModified(), null);
-        if (get.fetch()) {
-            subscription.setEtag(get.getETag());
-            subscription.setLastModified(get.getLastModified());
-            subscription.setLastFetched(I2PAppContext.getGlobalContext().clock().now());
-        }
-        try {            
-            this.addresses = ConfigParser.parse(tmp);
-        } catch (IOException exp) {
-            this.addresses = new HashMap();
-        }
-        tmp.delete();
    }

    /**
     * Construct an AddressBook from the contents of the file at file. If the
-     * file cannot be read, construct an empty AddressBook
+     * file cannot be read, construct an empty AddressBook.
+     * This reads the entire file into memory.
+     * The resulting map is modifiable and may be a merge target.
     * 
     * @param file
     *            A File pointing at a file with lines in the format
@ -125,22 +144,38 @@ class AddressBook {
     */
    public AddressBook(File file) {
        this.location = file.toString();
+        Map<String, String> a;
        try {
-            this.addresses = ConfigParser.parse(file);
+            a = ConfigParser.parse(file);
        } catch (IOException exp) {
-            this.addresses = new HashMap();
+            a = new HashMap();
        }
+        this.addresses = a;
+        this.subFile = null;
    }

    /**
-     * Return a Map containing the addresses in the AddressBook.
-     * 
-     * @return A Map containing the addresses in the AddressBook, where the key
-     *         is a human readable name, and the value is a base64 i2p
-     *         destination.
+     * Return an iterator over the addresses in the AddressBook.
+     * @since 0.8.7
     */
-    public Map getAddresses() {
-        return this.addresses;
+    public Iterator<Map.Entry<String, String>> iterator() {
+        if (this.subFile != null)
+            return new ConfigIterator(this.subFile);
+        return this.addresses.entrySet().iterator();
+    }
+
+    /**
+     * Delete the temp file or clear the map.
+     * @since 0.8.7
+     */
+    public void delete() {
+        if (this.subFile != null) {
+            this.subFile.delete();
+        } else if (this.addresses != null) {
+            try {
+                this.addresses.clear();
+            } catch (UnsupportedOperationException uoe) {}
+        }
    }

    /**
@ -148,29 +183,32 @@ class AddressBook {
     * 
     * @return A String representing either an abstract path, or a url,
     *         depending on how the instance was constructed.
+     *         Will be null if created with the Map constructor.
     */
    public String getLocation() {
        return this.location;
    }

    /**
-     * Return a string representation of the contents of the AddressBook.
+     * Return a string representation of the origin of the AddressBook.
     * 
-     * @return A String representing the contents of the AddressBook.
+     * @return A String representing the origin of the AddressBook.
     */
    @Override
    public String toString() {
-        return this.addresses.toString();
+        if (this.location != null)
+            return "Book from " + this.location;
+        return "Map containing " + this.addresses.size() + " entries";
    }

    private static final int MIN_DEST_LENGTH = 516;
    private static final int MAX_DEST_LENGTH = MIN_DEST_LENGTH + 100;  // longer than any known cert type for now

    /**
-     * Do basic validation of the hostname and dest
+     * Do basic validation of the hostname
     * hostname was already converted to lower case by ConfigParser.parse()
     */
-    private static boolean valid(String host, String dest) {
+    public static boolean isValidKey(String host) {
 	return
 		host.endsWith(".i2p") &&
 		host.length() > 4 &&
@ -194,8 +232,15 @@ class AddressBook {
                (! host.equals("console.i2p")) &&
                (! host.endsWith(".proxy.i2p")) &&
                (! host.endsWith(".router.i2p")) &&
-                (! host.endsWith(".console.i2p")) &&
+                (! host.endsWith(".console.i2p"))
+                ;	
+    }

+    /**
+     * Do basic validation of the b64 dest, without bothering to instantiate it
+     */
+    private static boolean isValidDest(String dest) {
+	return
                // null cert ends with AAAA but other zero-length certs would be AA
 		((dest.length() == MIN_DEST_LENGTH && dest.endsWith("AA")) ||
 		 (dest.length() > MIN_DEST_LENGTH && dest.length() <= MAX_DEST_LENGTH)) &&
@ -216,18 +261,21 @@ class AddressBook {
     * @param overwrite True to overwrite
     * @param log
     *            The log to write messages about new addresses or conflicts to.
+     *
+     * @throws IllegalStateException if this was created with the Subscription constructor.
     */
    public void merge(AddressBook other, boolean overwrite, Log log) {
-        Iterator otherIter = other.addresses.keySet().iterator();
+        if (this.addresses == null)
+            throw new IllegalStateException();
+        for (Iterator<Map.Entry<String, String>> iter = other.iterator(); iter.hasNext(); ) {
+            Map.Entry<String, String> entry = iter.next();
+            String otherKey = entry.getKey();
+            String otherValue = entry.getValue();

-        while (otherIter.hasNext()) {
-            String otherKey = (String) otherIter.next();
-            String otherValue = (String) other.addresses.get(otherKey);
-
-            if (valid(otherKey, otherValue)) {
+            if (isValidKey(otherKey) && isValidDest(otherValue)) {
                if (this.addresses.containsKey(otherKey) && !overwrite) {
-                    if (!this.addresses.get(otherKey).equals(otherValue)
-                            && log != null) {
+                    if (DEBUG && log != null &&
+                        !this.addresses.get(otherKey).equals(otherValue)) {
                        log.append("Conflict for " + otherKey + " from "
                                + other.location
                                + ". Destination in remote address book is "
@ -252,8 +300,12 @@ class AddressBook {
     * 
     * @param file
     *            The file to write the contents of this AddressBook too.
+     *
+     * @throws IllegalStateException if this was created with the Subscription constructor.
     */
    public void write(File file) {
+        if (this.addresses == null)
+            throw new IllegalStateException();
        if (this.modified) {
            try {
                ConfigParser.write(this.addresses, file);
@ -267,8 +319,17 @@ class AddressBook {
     * Write this AddressBook out to the file it was read from. Requires that
     * AddressBook was constructed from a file on the local filesystem. If the
     * file cannot be writen to, this method will silently fail.
+     *
+     * @throws IllegalStateException if this was not created with the File constructor.
     */
    public void write() {
+        if (this.location == null || this.location.startsWith("http://"))
+            throw new IllegalStateException();
        this.write(new File(this.location));
    }
+
+    @Override
+    protected void finalize() {
+        delete();
+    }
 }
--- a/apps/addressbook/java/src/net/i2p/addressbook/ConfigIterator.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/ConfigIterator.java
@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2004 Ragnarok
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package net.i2p.addressbook;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+import java.util.NoSuchElementException;
+
+/**
+ *  A class to iterate through a hosts.txt or config file without
+ *  reading the whole thing into memory.
+ *  Keys are always converted to lower case.
+ *
+ *  Callers should iterate all the way through or call close()
+ *  to ensure the underlying stream is closed.
+ *
+ *  @since 0.8.7
+ */
+class ConfigIterator implements Iterator<Map.Entry<String, String>> {
+
+    private BufferedReader input;
+    private ConfigEntry next;
+
+    /**
+     *  A dummy iterator in which hasNext() is always false.
+     */
+    public ConfigIterator() {}
+
+    /**
+     *  An iterator over the key/value pairs in the file.
+     */
+    public ConfigIterator(File file) {
+        try {
+            FileInputStream fileStream = new FileInputStream(file);
+            input = new BufferedReader(new InputStreamReader(fileStream));
+        } catch (IOException ioe) {}
+    }
+
+    public boolean hasNext() {
+        if (input == null)
+            return false;
+        if (next != null)
+            return true;
+        try {
+            String inputLine = input.readLine();
+            while (inputLine != null) {
+                inputLine = ConfigParser.stripComments(inputLine);
+                String[] splitLine = inputLine.split("=");
+                if (splitLine.length == 2) {
+                    next = new ConfigEntry(splitLine[0].trim().toLowerCase(Locale.US), splitLine[1].trim());
+                    return true;
+                }
+                inputLine = input.readLine();
+            }
+        } catch (IOException ioe) {}
+        try { input.close(); } catch (IOException ioe) {}
+        input = null;
+        next = null;
+        return false;
+    }
+
+    public Map.Entry<String, String> next() {
+        if (!hasNext())
+            throw new NoSuchElementException();
+        Map.Entry<String, String> rv = next;
+        next = null;
+        return rv;
+    }
+
+    public void remove() {
+        throw new UnsupportedOperationException();
+    }
+
+    public void close() {
+        if (input != null) {
+            try { input.close(); } catch (IOException ioe) {}
+        }
+    }
+
+    @Override
+    protected void finalize() {
+        close();
+    }
+
+    /**
+     *  The object returned by the iterator.
+     */
+    private static class ConfigEntry implements Map.Entry<String, String> {
+        private final String key;
+        private final String value;
+
+        public ConfigEntry(String k, String v) {
+            key = k;
+            value = v;
+        }
+
+        public String getKey() {
+            return key;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String setValue(String v) {
+            throw new UnsupportedOperationException();
+        }
+
+        public int hashCode() {
+            return key.hashCode() ^ value.hashCode();
+        }
+
+        public boolean equals(Object o) {
+            if (!(o instanceof Map.Entry))
+                return false;
+            Map.Entry e = (Map.Entry) o;
+            return key.equals(e.getKey()) && value.equals(e.getValue());
+        }
+    }
+}
--- a/apps/addressbook/java/src/net/i2p/addressbook/ConfigParser.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/ConfigParser.java
@ -30,9 +30,9 @@ import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.StringReader;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;

 import net.i2p.util.SecureFile;
@ -85,15 +85,15 @@ class ConfigParser {
     *             if the BufferedReader cannot be read.
     *  
     */
-    public static Map parse(BufferedReader input) throws IOException {
-        Map result = new HashMap();
+    public static Map<String, String>  parse(BufferedReader input) throws IOException {
+        Map<String, String>  result = new HashMap();
        String inputLine;
        inputLine = input.readLine();
        while (inputLine != null) {
            inputLine = ConfigParser.stripComments(inputLine);
            String[] splitLine = inputLine.split("=");
            if (splitLine.length == 2) {
-                result.put(splitLine[0].trim().toLowerCase(), splitLine[1].trim());
+                result.put(splitLine[0].trim().toLowerCase(Locale.US), splitLine[1].trim());
            }
            inputLine = input.readLine();
        }
@ -111,11 +111,11 @@ class ConfigParser {
     * @throws IOException
     *             if file cannot be read.
     */
-    public static Map parse(File file) throws IOException {
+    public static Map<String, String>  parse(File file) throws IOException {
        FileInputStream fileStream = new FileInputStream(file);
        BufferedReader input = new BufferedReader(new InputStreamReader(
                fileStream));
-        Map rv = ConfigParser.parse(input);
+        Map<String, String>  rv = ConfigParser.parse(input);
        try {
            fileStream.close();
        } catch (IOException ioe) {}
@ -132,7 +132,7 @@ class ConfigParser {
     * @throws IOException
     *             if file cannot be read.
     */
-    public static Map parse(String string) throws IOException {
+    public static Map<String, String>  parse(String string) throws IOException {
        StringReader stringReader = new StringReader(string);
        BufferedReader input = new BufferedReader(stringReader);
        return ConfigParser.parse(input);
@ -149,14 +149,13 @@ class ConfigParser {
     * @return A Map containing the key, value pairs from file, or if file
     *         cannot be read, map.
     */
-    public static Map parse(File file, Map map) {
-        Map result;
+    public static Map<String, String>  parse(File file, Map<String, String>  map) {
+        Map<String, String>  result;
        try {
            result = ConfigParser.parse(file);
-            for (Iterator iter = map.keySet().iterator(); iter.hasNext(); ) {
-                String key = (String) iter.next();
-                if (!result.containsKey(key))
-                    result.put(key, map.get(key));
+            for (Map.Entry<String, String> entry : map.entrySet()) {
+                if (!result.containsKey(entry.getKey()))
+                    result.put(entry.getKey(), entry.getValue());
            }
        } catch (IOException exp) {
            result = map;
@ -177,9 +176,9 @@ class ConfigParser {
     * @throws IOException
     *             if input cannot be read.
     */
-    public static List parseSubscriptions(BufferedReader input)
+    public static List<String> parseSubscriptions(BufferedReader input)
            throws IOException {
-        List result = new LinkedList();
+        List<String> result = new LinkedList();
        String inputLine = input.readLine();
        while (inputLine != null) {
            inputLine = ConfigParser.stripComments(inputLine).trim();
@ -201,11 +200,11 @@ class ConfigParser {
     * @throws IOException
     *             if file cannot be read.
     */
-    public static List parseSubscriptions(File file) throws IOException {
+    public static List<String> parseSubscriptions(File file) throws IOException {
        FileInputStream fileStream = new FileInputStream(file);
        BufferedReader input = new BufferedReader(new InputStreamReader(
                fileStream));
-        List rv = ConfigParser.parseSubscriptions(input);
+        List<String> rv = ConfigParser.parseSubscriptions(input);
        try {
            fileStream.close();
        } catch (IOException ioe) {}
@ -221,7 +220,7 @@ class ConfigParser {
     * @throws IOException
     *             if string cannot be read.
     */
-    public static List parseSubscriptions(String string) throws IOException {
+    public static List<String> parseSubscriptions(String string) throws IOException {
        StringReader stringReader = new StringReader(string);
        BufferedReader input = new BufferedReader(stringReader);
        return ConfigParser.parseSubscriptions(input);
@ -238,8 +237,8 @@ class ConfigParser {
     * @return A List consisting of one element for each line in file, or if
     *         file cannot be read, list.
     */
-    public static List parseSubscriptions(File file, List list) {
-        List result;
+    public static List<String> parseSubscriptions(File file, List<String> list) {
+        List<String> result;
        try {
            result = ConfigParser.parseSubscriptions(file);
        } catch (IOException exp) {
@ -263,12 +262,9 @@ class ConfigParser {
     * @throws IOException
     *             if the BufferedWriter cannot be written to.
     */
-    public static void write(Map map, BufferedWriter output) throws IOException {
-        Iterator keyIter = map.keySet().iterator();
-
-        while (keyIter.hasNext()) {
-            String key = (String) keyIter.next();
-            output.write(key + "=" + (String) map.get(key));
+    public static void write(Map<String, String>  map, BufferedWriter output) throws IOException {
+        for (Map.Entry<String, String> entry : map.entrySet()) {
+            output.write(entry.getKey() + '=' + entry.getValue());
            output.newLine();
        }
        output.close();
@ -288,7 +284,7 @@ class ConfigParser {
     * @throws IOException
     *             if file cannot be written to.
     */
-    public static void write(Map map, File file) throws IOException {
+    public static void write(Map<String, String>  map, File file) throws IOException {
        boolean success = false;
        if (!isWindows) {
            File tmp = SecureFile.createTempFile("temp-", ".tmp", file.getAbsoluteFile().getParentFile());
@ -318,12 +314,10 @@ class ConfigParser {
     * @throws IOException
     *             if output cannot be written to.
     */
-    public static void writeSubscriptions(List list, BufferedWriter output)
+    public static void writeSubscriptions(List<String> list, BufferedWriter output)
            throws IOException {
-        Iterator iter = list.iterator();
-
-        while (iter.hasNext()) {
-            output.write((String) iter.next());
+        for (String s : list) {
+            output.write(s);
            output.newLine();
        }
        output.close();
@ -340,7 +334,7 @@ class ConfigParser {
     * @throws IOException
     *             if output cannot be written to.
     */
-    public static void writeSubscriptions(List list, File file)
+    public static void writeSubscriptions(List<String> list, File file)
            throws IOException {
        ConfigParser.writeSubscriptions(list, new BufferedWriter(
                new OutputStreamWriter(new SecureFileOutputStream(file), "UTF-8")));
--- a/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java
@ -22,13 +22,20 @@
 package net.i2p.addressbook;

 import java.io.File;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
+import java.util.Set;

 import net.i2p.I2PAppContext;
+import net.i2p.client.naming.NamingService;
+import net.i2p.client.naming.SingleFileNamingService;
+import net.i2p.data.DataFormatException;
+import net.i2p.data.Destination;
 import net.i2p.util.SecureDirectory;

 /**
@ -41,6 +48,7 @@ public class Daemon {
    public static final String VERSION = "2.0.4";
    private static final Daemon _instance = new Daemon();
    private boolean _running;
+    private static final boolean DEBUG = false;
    
    /**
     * Update the router and published address books using remote data from the
@ -49,29 +57,166 @@ public class Daemon {
     * @param master
     *            The master AddressBook. This address book is never
     *            overwritten, so it is safe for the user to write to.
+     *            It is only merged to the published addressbook.
+     *            May be null.
     * @param router
     *            The router AddressBook. This is the address book read by
     *            client applications.
     * @param published
     *            The published AddressBook. This address book is published on
     *            the user's eepsite so that others may subscribe to it.
+     *            May be null.
+     *            If non-null, overwrite with the new addressbook.
     * @param subscriptions
     *            A SubscriptionList listing the remote address books to update
     *            from.
     * @param log
     *            The log to write changes and conflicts to.
+     *            May be null.
     */
-    public void update(AddressBook master, AddressBook router,
+    public static void update(AddressBook master, AddressBook router,
            File published, SubscriptionList subscriptions, Log log) {
-        router.merge(master, true, null);
-        Iterator iter = subscriptions.iterator();
+        Iterator<AddressBook> iter = subscriptions.iterator();
        while (iter.hasNext()) {
            // yes, the EepGet fetch() is done in next()
-            router.merge((AddressBook) iter.next(), false, log);
+            router.merge(iter.next(), false, log);
        }
        router.write();
-        if (published != null)
+        if (published != null) {
+            if (master != null)
+                router.merge(master, true, null);
            router.write(published);
+        }
+        subscriptions.write();
+    }
+
+    /**
+     * Update the router and published address books using remote data from the
+     * subscribed address books listed in subscriptions.
+     * Merging of the "master" addressbook is NOT supported.
+     * 
+     * @param router
+     *            The NamingService to update, generally the root NamingService from the context.
+     * @param published
+     *            The published AddressBook. This address book is published on
+     *            the user's eepsite so that others may subscribe to it.
+     *            May be null.
+     *            If non-null, overwrite with the new addressbook.
+     * @param subscriptions
+     *            A SubscriptionList listing the remote address books to update
+     *            from.
+     * @param log
+     *            The log to write changes and conflicts to.
+     *            May be null.
+     * @since 0.8.7
+     */
+    public static void update(NamingService router, File published, SubscriptionList subscriptions, Log log) {
+        // If the NamingService is a database, we look up as we go.
+        // If it is a text file, we do things differently, to avoid O(n**2) behavior
+        // when scanning large subscription results (i.e. those that return the whole file, not just the new entries) -
+        // we load all the known hostnames into a Set one time.
+        // This also has the advantage of not flushing the NamingService's LRU cache.
+        String nsClass = router.getClass().getSimpleName();
+        boolean isTextFile = nsClass.equals("HostsTxtNamingService") || nsClass.equals("SingleFileNamingService");
+        Set<String> knownNames = null;
+
+        NamingService publishedNS = null;
+        Iterator<AddressBook> iter = subscriptions.iterator();
+        while (iter.hasNext()) {
+            // yes, the EepGet fetch() is done in next()
+            long start = System.currentTimeMillis();
+            AddressBook sub = iter.next();
+            long end = System.currentTimeMillis();
+            // SubscriptionIterator puts in a dummy AddressBook with no location if no fetch is done
+            if (DEBUG && log != null && sub.getLocation() != null)
+                log.append("Fetch of " + sub.getLocation() + " took " + (end - start));
+            start = end;
+            int old = 0, nnew = 0, invalid = 0, conflict = 0, total = 0;
+            for (Iterator<Map.Entry<String, String>> eIter = sub.iterator(); eIter.hasNext(); ) {
+                Map.Entry<String, String> entry = eIter.next();
+                String key = entry.getKey();
+                boolean isKnown;
+                Destination oldDest = null;
+                if (isTextFile) {
+                    if (knownNames == null) {
+                        // load the hostname set
+                        Properties opts = new Properties();
+                        opts.setProperty("file", "hosts.txt");
+                        knownNames = router.getNames(opts);
+                    }
+                    isKnown = knownNames.contains(key);
+                } else {
+                    oldDest = router.lookup(key);
+                    isKnown = oldDest != null;
+                }
+                try {
+                    if (!isKnown) {
+                        if (AddressBook.isValidKey(key)) {
+                            Destination dest = new Destination(entry.getValue());
+                            Properties props = new Properties();
+                            props.setProperty("s", sub.getLocation());
+                            boolean success = router.put(key, dest, props);
+                            if (log != null) {
+                                if (success)
+                                    log.append("New address " + key +
+                                               " added to address book. From: " + sub.getLocation());
+                                else
+                                    log.append("Save to naming service " + router + " failed for new key " + key);
+                            }
+                            // now update the published addressbook
+                            if (published != null) {
+                                if (publishedNS == null)
+                                    publishedNS = new SingleFileNamingService(I2PAppContext.getGlobalContext(), published.getAbsolutePath());
+                                success = publishedNS.putIfAbsent(key, dest);
+                                if (!success) {
+                                    try {
+                                        log.append("Save to published address book " + published.getCanonicalPath() + " failed for new key " + key);
+                                    } catch (IOException ioe) {}
+                                }
+                            }
+                            if (isTextFile)
+                                // keep track for later dup check
+                                knownNames.add(key);
+                            nnew++;
+                        } else if (log != null) {
+                            log.append("Bad hostname " + key + " from "
+                                   + sub.getLocation());
+                            invalid++;
+                        }        
+                    } else if (false && DEBUG && log != null) {
+                        // lookup the conflict if we haven't yet (O(n**2) for text file)
+                        if (isTextFile)
+                            oldDest = router.lookup(key);
+                        if (oldDest != null && !oldDest.toBase64().equals(entry.getValue())) {
+                            log.append("Conflict for " + key + " from "
+                                       + sub.getLocation()
+                                       + ". Destination in remote address book is "
+                                       + entry.getValue());
+                            conflict++;
+                        } else {
+                            old++;
+                        }
+                    } else {
+                        old++;
+                    }
+                } catch (DataFormatException dfe) {
+                    if (log != null)
+                        log.append("Invalid b64 for " + key + " From: " + sub.getLocation());
+                    invalid++;
+                }
+                total++;
+            }
+            if (DEBUG && log != null && total > 0) {
+                log.append("Merge of " + sub.getLocation() + " into " + router +
+                           " took " + (System.currentTimeMillis() - start) + " ms with " +
+                           total + " total, " +
+                           nnew + " new, " +
+                           old + " old, " +
+                           invalid + " invalid, " +
+                           conflict + " conflicts");
+            }
+            sub.delete();
+        }
        subscriptions.write();
    }

@ -83,44 +228,80 @@ public class Daemon {
     * @param home
     *            The directory containing addressbook's configuration files.
     */
-    public void update(Map settings, String home) {
-        File masterFile = new File(home, (String) settings
-                .get("master_addressbook"));
-        File routerFile = new File(home, (String) settings
-                .get("router_addressbook"));
+    public static void update(Map<String, String> settings, String home) {
        File published = null;
-        if ("true".equals(settings.get("should_publish"))) 
-            published = new File(home, (String) settings
+        boolean should_publish = Boolean.valueOf(settings.get("should_publish")).booleanValue();
+        if (should_publish) 
+            published = new File(home, settings
                .get("published_addressbook"));
-        File subscriptionFile = new File(home, (String) settings
+        File subscriptionFile = new File(home, settings
                .get("subscriptions"));
-        File logFile = new File(home, (String) settings.get("log"));
-        File etagsFile = new File(home, (String) settings.get("etags"));
-        File lastModifiedFile = new File(home, (String) settings
+        File logFile = new File(home, settings.get("log"));
+        File etagsFile = new File(home, settings.get("etags"));
+        File lastModifiedFile = new File(home, settings
                .get("last_modified"));
-        File lastFetchedFile = new File(home, (String) settings
+        File lastFetchedFile = new File(home, settings
                .get("last_fetched"));
        long delay;
        try {
-            delay = Long.parseLong((String) settings.get("update_delay"));
+            delay = Long.parseLong(settings.get("update_delay"));
        } catch (NumberFormatException nfe) {
            delay = 12;
        }
        delay *= 60 * 60 * 1000;
-
-        AddressBook master = new AddressBook(masterFile);
-        AddressBook router = new AddressBook(routerFile);
        
-        List defaultSubs = new LinkedList();
+        List<String> defaultSubs = new LinkedList();
        // defaultSubs.add("http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/hosts.txt");
        defaultSubs.add("http://www.i2p2.i2p/hosts.txt");
        
        SubscriptionList subscriptions = new SubscriptionList(subscriptionFile,
-                etagsFile, lastModifiedFile, lastFetchedFile, delay, defaultSubs, (String) settings
-                .get("proxy_host"), Integer.parseInt((String) settings.get("proxy_port")));
+                etagsFile, lastModifiedFile, lastFetchedFile, delay, defaultSubs, settings
+                .get("proxy_host"), Integer.parseInt(settings.get("proxy_port")));
        Log log = new Log(logFile);

-        update(master, router, published, subscriptions, log);
+        // If false, add hosts via naming service; if true, write hosts.txt file directly
+        // Default false
+        if (Boolean.valueOf(settings.get("update_direct")).booleanValue()) {
+            // Direct hosts.txt access
+            File routerFile = new File(home, settings.get("router_addressbook"));
+            AddressBook master;
+            if (should_publish) {
+                File masterFile = new File(home, settings.get("master_addressbook"));
+                master = new AddressBook(masterFile);
+            } else {
+                master = null;
+            }
+            AddressBook router = new AddressBook(routerFile);
+            update(master, router, published, subscriptions, log);
+        } else {
+            // Naming service - no merging of master to router and published is supported.
+            update(getNamingService(settings.get("naming_service")), published, subscriptions, log);
+        }
+    }
+
+    /** depth-first search */
+    private static NamingService searchNamingService(NamingService ns, String srch)
+    {
+        String name = ns.getName();
+        if (name.equals(srch) || name.endsWith('/' + srch) || name.endsWith('\\' + srch))
+            return ns;
+        List<NamingService> list = ns.getNamingServices();
+        if (list != null) {
+            for (NamingService nss : list) {
+                NamingService rv = searchNamingService(nss, srch);
+                if (rv != null)
+                    return rv;
+            }
+        }
+        return null;                
+    }
+
+    /** @return the configured NamingService, or the root NamingService */
+    private static NamingService getNamingService(String srch)
+    {
+        NamingService root = I2PAppContext.getGlobalContext().namingService();
+        NamingService rv = searchNamingService(root, srch);
+        return rv != null ? rv : root;                
    }

    /**
@ -149,7 +330,7 @@ public class Daemon {
            homeFile = new SecureDirectory(System.getProperty("user.dir"));
        }
        
-        Map defaultSettings = new HashMap();
+        Map<String, String> defaultSettings = new HashMap();
        defaultSettings.put("proxy_host", "127.0.0.1");
        defaultSettings.put("proxy_port", "4444");
        defaultSettings.put("master_addressbook", "../userhosts.txt");
@ -162,6 +343,8 @@ public class Daemon {
        defaultSettings.put("last_modified", "last_modified");
        defaultSettings.put("last_fetched", "last_fetched");
        defaultSettings.put("update_delay", "12");
+        defaultSettings.put("update_direct", "false");
+        defaultSettings.put("naming_service", "hosts.txt");
        
        if (!homeFile.exists()) {
            boolean created = homeFile.mkdirs();
@ -173,7 +356,7 @@ public class Daemon {
        
        File settingsFile = new File(homeFile, settingsLocation);
        
-        Map settings = ConfigParser.parse(settingsFile, defaultSettings);
+        Map<String, String> settings = ConfigParser.parse(settingsFile, defaultSettings);
        // wait
        try {
            Thread.sleep(5*60*1000 + I2PAppContext.getGlobalContext().random().nextLong(5*60*1000));
@ -181,7 +364,7 @@ public class Daemon {
        } catch (InterruptedException ie) {}
        
        while (_running) {
-            long delay = Long.parseLong((String) settings.get("update_delay"));
+            long delay = Long.parseLong(settings.get("update_delay"));
            if (delay < 1) {
                delay = 1;
            }
--- a/apps/addressbook/java/src/net/i2p/addressbook/DaemonThread.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/DaemonThread.java
@ -21,13 +21,18 @@

 package net.i2p.addressbook;

+import java.util.Properties;
+
+import net.i2p.I2PAppContext;
+import net.i2p.client.naming.NamingServiceUpdater;
+
 /**
 * A thread that waits five minutes, then runs the addressbook daemon.  
 * 
 * @author Ragnarok
 *
 */
-class DaemonThread extends Thread {
+public class DaemonThread extends Thread implements NamingServiceUpdater {

    private String[] args;

@ -49,11 +54,22 @@ class DaemonThread extends Thread {
        //    Thread.sleep(5 * 60 * 1000);
        //} catch (InterruptedException exp) {
        //}
+        I2PAppContext.getGlobalContext().namingService().registerUpdater(this);
        Daemon.main(this.args);
+        I2PAppContext.getGlobalContext().namingService().unregisterUpdater(this);
    }

    public void halt() {
        Daemon.stop();
        interrupt();
    }
+
+    /**
+     *  The NamingServiceUpdater interface
+     *  @param options ignored
+     *  @since 0.8.7
+     */
+    public void update(Properties options) {
+        interrupt();
+    }
 }
--- a/apps/addressbook/java/src/net/i2p/addressbook/Servlet.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/Servlet.java
@ -84,7 +84,7 @@ public class Servlet extends HttpServlet {
        this.thread.setDaemon(true);
        this.thread.setName("Addressbook");
        this.thread.start();
-        System.out.println("INFO: Starting Addressbook " + Daemon.VERSION);
+        //System.out.println("INFO: Starting Addressbook " + Daemon.VERSION);
        //System.out.println("INFO: config root under " + args[0]);
    }

--- a/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionIterator.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionIterator.java
@ -26,7 +26,6 @@ import java.util.Iterator;
 import java.util.List;

 import net.i2p.I2PAppContext;
-import net.i2p.data.DataHelper;  // debug

 /**
 * An iterator over the subscriptions in a SubscriptionList.  Note that this iterator
@ -35,9 +34,9 @@ import net.i2p.data.DataHelper;  // debug
 * 
 * @author Ragnarok
 */
-class SubscriptionIterator implements Iterator {
+class SubscriptionIterator implements Iterator<AddressBook> {

-    private Iterator subIterator;
+    private Iterator<Subscription> subIterator;
    private String proxyHost;
    private int proxyPort;
    private final long delay;
@ -51,7 +50,7 @@ class SubscriptionIterator implements Iterator {
     * @param proxyHost proxy hostname
     * @param proxyPort proxt port number
     */
-    public SubscriptionIterator(List subscriptions, long delay, String proxyHost, int proxyPort) {
+    public SubscriptionIterator(List<Subscription> subscriptions, long delay, String proxyHost, int proxyPort) {
        this.subIterator = subscriptions.iterator();
        this.delay = delay;
        this.proxyHost = proxyHost;
@ -72,8 +71,8 @@ class SubscriptionIterator implements Iterator {
     * see java.util.Iterator#next()
     * @return an AddressBook (empty if the minimum delay has not been met)
     */
-    public Object next() {
-        Subscription sub = (Subscription) this.subIterator.next();
+    public AddressBook next() {
+        Subscription sub = this.subIterator.next();
        if (sub.getLastFetched() + this.delay < I2PAppContext.getGlobalContext().clock().now()) {
            //System.err.println("Fetching addressbook from " + sub.getLocation());
            return new AddressBook(sub, this.proxyHost, this.proxyPort);
--- a/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionList.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionList.java
@ -24,7 +24,6 @@ package net.i2p.addressbook;
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@ -37,7 +36,7 @@ import java.util.Map;
 */
 class SubscriptionList {

-    private List subscriptions;
+    private List<Subscription> subscriptions;

    private File etagsFile;

@ -68,7 +67,7 @@ class SubscriptionList {
     * @param proxyPort proxy port number
     */
    public SubscriptionList(File locationsFile, File etagsFile,
-            File lastModifiedFile, File lastFetchedFile, long delay, List defaultSubs, String proxyHost, 
+            File lastModifiedFile, File lastFetchedFile, long delay, List<String> defaultSubs, String proxyHost, 
            int proxyPort) {
        this.subscriptions = new LinkedList();
        this.etagsFile = etagsFile;
@ -77,11 +76,10 @@ class SubscriptionList {
        this.delay = delay;
        this.proxyHost = proxyHost;
        this.proxyPort = proxyPort;
-        Map etags;
-        Map lastModified;
-        Map lastFetched;
-        String location;
-        List locations = ConfigParser.parseSubscriptions(locationsFile, 
+        Map<String, String> etags;
+        Map<String, String> lastModified;
+        Map<String, String> lastFetched;
+        List<String> locations = ConfigParser.parseSubscriptions(locationsFile, 
                defaultSubs);
        try {
            etags = ConfigParser.parse(etagsFile);
@ -98,12 +96,10 @@ class SubscriptionList {
        } catch (IOException exp) {
            lastFetched = new HashMap();
        }
-        Iterator iter = locations.iterator();
-        while (iter.hasNext()) {
-            location = (String) iter.next();
-            this.subscriptions.add(new Subscription(location, (String) etags.get(location),
-                                   (String) lastModified.get(location),
-                                   (String) lastFetched.get(location)));
+        for (String location : locations) {
+            this.subscriptions.add(new Subscription(location, etags.get(location),
+                                   lastModified.get(location),
+                                   lastFetched.get(location)));
        }
    }
    
@ -125,13 +121,10 @@ class SubscriptionList {
     * won't be read back correctly; the '=' should be escaped.
     */
    public void write() {
-        Iterator iter = this.subscriptions.iterator();
-        Subscription sub;
-        Map etags = new HashMap();
-        Map lastModified = new HashMap();
-        Map lastFetched = new HashMap();
-        while (iter.hasNext()) {
-            sub = (Subscription) iter.next();
+        Map<String, String> etags = new HashMap();
+        Map<String, String>  lastModified = new HashMap();
+        Map<String, String>  lastFetched = new HashMap();
+        for (Subscription sub : this.subscriptions) {
            if (sub.getEtag() != null) {
                etags.put(sub.getLocation(), sub.getEtag());
            }
--- a/apps/atalk/src/ATalk.java
+++ b/apps/atalk/src/ATalk.java
@ -1,381 +0,0 @@
-package net.i2p.client;
-
-/*
- * free (adj.): unencumbered; not under the control of others
- * Written by jrandom in 2003 and released into the public domain 
- * with no warranty of any kind, either expressed or implied.  
- * It probably won't  make your computer catch on fire, or eat 
- * your children, but it might.  Use at your own risk.
- *
- */
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Properties;
-
-import net.i2p.I2PAppContext;
-import net.i2p.I2PException;
-import net.i2p.data.DataFormatException;
-import net.i2p.data.Destination;
-import net.i2p.util.Clock;
-import net.i2p.util.I2PThread;
-import net.i2p.util.Log;
-
-/**
- * ATalk - anonymous talk, demonstrating a trivial I2P usage scenario.
- * Run this class with no arguments for a manual.
- *
- * @author jrandom
- */
-public class ATalk implements I2PSessionListener, Runnable {
-    /** logging hook - status messages are piped to this */
-    private final static Log _log = new Log(ATalk.class);
-    
-    /** platform independent newline */
-    private final static String NL = System.getProperty("line.separator");
-    
-    /** the current session */
-    private I2PSession _session;
-    
-    /** who am i */
-    private Destination _myDestination;
-    
-    /** who are you? */
-    private Destination _peerDestination;
-    
-    /** location of my secret key file */
-    private String _myKeyFile;
-    
-    /** location of their public key */
-    private String _theirDestinationFile;
-    
-    /** where the application reads input from.  currently set to standard input */
-    private BufferedReader _in;
-    
-    /** where the application sends output to.  currently set to standard output */
-    private BufferedWriter _out;
-    
-    /** string that messages must begin with to be treated as files */
-    private final static String FILE_COMMAND = ".file: ";
-    
-    /** the, erm, manual */
-    private final static String MANUAL = "ATalk: Anonymous Talk, a demo program for the Invisible Internet Project SDK"
-                                         + NL
-                                         + "To generate a new destination:"
-                                         + NL
-                                         + "\tATalk [fileToSavePrivateKeyIn] [fileToSavePublicKeyIn]"
-                                         + NL
-                                         + "To talk to another destination:"
-                                         + NL
-                                         + "\tATalk [myPrivateKeyFile] [peerPublicKey] [shouldLogToScreen]"
-                                         + NL
-                                         + "shouldLogToScreen is 'true' or 'false', depending on whether you want log info on the screen"
-                                         + NL
-                                         + "When talking to another destination, messages are sent after you hit return"
-                                         + NL
-                                         + "To send a file, send a message saying:"
-                                         + NL
-                                         + "\t"
-                                         + FILE_COMMAND
-                                         + "[filenameToSend]"
-                                         + NL
-                                         + "The peer will then recieve the file and be notified of where it has been saved"
-                                         + NL
-                                         + "To end the talk session, enter a period on a line by itself and hit return"
-                                         + NL;
-    
-    public final static String PROP_CONFIG_LOCATION = "configFile";
-    
-    private static final SimpleDateFormat _fmt = new SimpleDateFormat("hh:mm:ss.SSS");
-
-    /** Construct the talk engine, but don't connect yet */
-    public ATalk(String myKeyFile, String theirDestFile) {
-        _myKeyFile = myKeyFile;
-        _theirDestinationFile = theirDestFile;
-    }
-
-    /** Actually start up the connection to the I2P network.
-     * Successful connect does not mean the peer is online or reachable.
-     *
-     * @throws IOException if there is a problem reading in the keys from the files specified
-     * @throws DataFormatException if the key files are not in the valid format
-     * @throws I2PSessionException if there is a problem contacting the I2P router
-     */
-    public void connect() throws IOException, I2PSessionException, DataFormatException {
-        I2PClient client = I2PClientFactory.createClient();
-        File myFile = new File(_myKeyFile);
-        Properties props = new Properties();
-        String configLocation = System.getProperty(PROP_CONFIG_LOCATION, "atalk.config");
-        try {
-            props.load(new FileInputStream(configLocation));
-        } catch (FileNotFoundException fnfe) {
-            _log.warn("Unable to load up the ATalk config file " + configLocation);
-        }
-        // Provide any router or client API configuration here.
-        if (!props.containsKey(I2PClient.PROP_TCP_HOST))
-            props.setProperty(I2PClient.PROP_TCP_HOST, "localhost");
-        if (!props.containsKey(I2PClient.PROP_TCP_PORT))
-            props.setProperty(I2PClient.PROP_TCP_PORT, "7654");
-        if (!props.containsKey(I2PClient.PROP_RELIABILITY))
-            props.setProperty(I2PClient.PROP_RELIABILITY, I2PClient.PROP_RELIABILITY_BEST_EFFORT);
-        _session = client.createSession(new FileInputStream(myFile), props);
-        _session.setSessionListener(this);
-        _session.connect();
-
-        File peerDestFile = new File(_theirDestinationFile);
-        _peerDestination = new Destination();
-        _peerDestination.readBytes(new FileInputStream(peerDestFile));
-        return;
-    }
-
-    /** Actual bulk processing of the application, reading in user input, 
-     * sending messages, and displaying results.  When this function exits, the
-     * application is complete.
-     *
-     */
-    public void run() {
-        try {
-            connect();
-            _in = new BufferedReader(new InputStreamReader(System.in));
-            _out = new BufferedWriter(new OutputStreamWriter(System.out));
-
-            _out.write("Starting up anonymous talk session" + NL);
-
-            while (true) {
-                String line = _in.readLine();
-                if ((line == null) || (line.trim().length() <= 0)) continue;
-                if (".".equals(line)) {
-                    boolean ok = _session.sendMessage(_peerDestination, ("Peer disconnected at " + now()).getBytes());
-                    // ignore ok, we're closing
-                    break;
-                }
-                if (line.startsWith(FILE_COMMAND) && (line.trim().length() > FILE_COMMAND.length())) {
-                    try {
-                        String file = line.substring(FILE_COMMAND.length());
-                        boolean sent = sendFile(file);
-                        if (!sent) {
-                            _out.write("Failed sending the file: " + file + NL);
-                        }
-                    } catch (IOException ioe) {
-                        _out.write("Error sending the file: " + ioe.getMessage() + NL);
-                        _log.error("Error sending the file", ioe);
-                    }
-                } else {
-                    boolean ok = _session.sendMessage(_peerDestination, ("[" + now() + "] " + line).getBytes());
-                    if (!ok) {
-                        _out.write("Failed sending message.  Peer disconnected?" + NL);
-                    }
-                }
-            }
-        } catch (IOException ioe) {
-            _log.error("Error running", ioe);
-        } catch (I2PSessionException ise) {
-            _log.error("Error communicating", ise);
-        } catch (DataFormatException dfe) {
-            _log.error("Peer destination file is not valid", dfe);
-        } finally {
-            try {
-                _log.debug("Exiting anonymous talk session");
-                if (_out != null) _out.write("Exiting anonymous talk session");
-            } catch (IOException ioe) {
-                // ignored
-            }
-            if (_session != null) {
-                try {
-                    _session.destroySession();
-                } catch (I2PSessionException ise) {
-                    // ignored
-                }
-            }
-            try {
-                Thread.sleep(5000);
-            } catch (InterruptedException ie) { // nop!
-            }
-        }
-    }
-
-    private String now() {
-        Date now = new Date(Clock.getInstance().now());
-        return _fmt.format(now);
-    }
-
-    /** Send the given file to the current peer.  This works by sending a message
-     * saying ".file: filename\nbodyOfFile", where filename is the name of the file
-     * (which the recipient will be shown), and the bodyOfFile is the set of raw 
-     * bytes in the file.
-     *
-     * @throws IOException if the file could not be found or read
-     * @return false if the file could not be sent to the peer
-     */
-    private boolean sendFile(String filename) throws IOException, I2PSessionException {
-        _log.debug("Sending file [" + filename + "]");
-        ByteArrayOutputStream baos = new ByteArrayOutputStream(4096);
-        baos.write((FILE_COMMAND + filename + "\n").getBytes());
-        FileInputStream fin = new FileInputStream(filename);
-        byte buf[] = new byte[4096];
-        try {
-            while (true) {
-                int len = fin.read(buf);
-                if (len == -1) break;
-                baos.write(buf, 0, len);
-            }
-        } catch (IOException ioe) {
-            _log.debug("Failed reading the file", ioe);
-            return false;
-        }
-        baos.close();
-        byte val[] = baos.toByteArray();
-        _log.debug("Sending " + filename + " with a full payload of " + val.length);
-        try {
-            boolean rv = _session.sendMessage(_peerDestination, val);
-            _log.debug("Sending " + filename + " complete: rv = " + rv);
-            return rv;
-        } catch (Throwable t) {
-            _log.error("Error sending file", t);
-            return false;
-        }
-    }
-
-    /** I2PSessionListener.messageAvailable requires this method to be called whenever
-     * I2P wants to tell the session that a message is available.  ATalk always grabs
-     * the message immediately and either processes it as a "send file" command (passing
-     * it off to handleRecieveFile(..) or simply displays the
-     * message to the user.
-     *
-     */
-    public void messageAvailable(I2PSession session, int msgId, long size) {
-        _log.debug("Message available: id = " + msgId + " size = " + size);
-        try {
-            byte msg[] = session.receiveMessage(msgId);
-            // inefficient way to just read the first line of text, but its easy 
-            BufferedReader reader = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(msg)));
-            String line = reader.readLine();
-            if (line.startsWith(FILE_COMMAND)) {
-                handleRecieveFile(line, msg);
-            } else {
-                // not a file command, so just plop 'er out on the screen
-                _out.write(now() + " --> " + new String(msg));
-                _out.write(NL);
-                _out.flush();
-            }
-        } catch (I2PSessionException ise) {
-            _log.error("Error fetching available message", ise);
-        } catch (IOException ioe) {
-            _log.error("Error writing out the message", ioe);
-        }
-    }
-
-    /** React to a file being sent our way from the peer via {@link #sendFile sendFile} 
-     * by saving the file to a temporary location and displaying where, what, and how large 
-     * it is.
-     *
-     * @param firstline the first line of the message that, according to the sendFile 
-     *			implementation, contains the command and the filename that it was stored 
-     *			at on the peer's computer
-     * @param msg the entire message recieved, including the firstline
-     */
-    private void handleRecieveFile(String firstline, byte msg[]) throws IOException {
-        _log.debug("handleRecieveFile called");
-        File f = File.createTempFile("recieve", ".dat", new File("."));
-        FileOutputStream fos = new FileOutputStream(f);
-        int lineLen = firstline.getBytes().length + "\n".getBytes().length;
-        int lenToCopy = msg.length - lineLen;
-        byte buf[] = new byte[lenToCopy];
-        System.arraycopy(msg, lineLen, buf, 0, lenToCopy);
-        fos.write(buf);
-        fos.close();
-        String name = firstline.substring(FILE_COMMAND.length());
-        _out.write("Recieved a file called [" + name + "] of size [" + lenToCopy + "] bytes, saved as ["
-                   + f.getAbsolutePath() + "]" + NL);
-        _out.flush();
-    }
-
-    /** driver */
-    public static void main(String args[]) {
-        I2PAppContext context = new I2PAppContext();
-        if (args.length == 2) {
-            String myKeyFile = args[0];
-            String myDestinationFile = args[1];
-            boolean success = generateKeys(myKeyFile, myDestinationFile);
-            if (success)
-                _log.debug("Keys generated (private key file: " + myKeyFile + " destination file: " + myDestinationFile
-                           + ")");
-            else
-                _log.debug("Keys generation failed");
-            try {
-                Thread.sleep(5000);
-            } catch (InterruptedException ie) { // nop
-            }
-        } else if (args.length == 3) {
-            _log.debug("Starting chat");
-            String myKeyfile = args[0];
-            String peerDestFile = args[1];
-            String shouldLog = args[2];
-            if (Boolean.TRUE.toString().equalsIgnoreCase(shouldLog))
-                context.logManager().setDisplayOnScreen(true);
-            else
-                context.logManager().setDisplayOnScreen(false);
-            String logFile = args[2];
-            Thread talkThread = new I2PThread(new ATalk(myKeyfile, peerDestFile));
-            talkThread.start();
-        } else {
-            System.out.println(MANUAL);
-            try {
-                Thread.sleep(5000);
-            } catch (InterruptedException ie) { // nop
-            }
-            System.exit(-1);
-        }
-    }
-
-    /** Generate a new Destination, saving that destination and the associated 
-     * private keys in the privKeyFile, and also saving the destination without
-     * any private keys to destinationFile.
-     *
-     * @param privKeyFile private key file, including the destination and the various
-     *			    private keys, as defined by {@link I2PClient#createDestination I2PClient.createDestination}
-     * @param destinationFile file in which the Destination is serialized in
-     */
-    private static boolean generateKeys(String privKeyFile, String destinationFile) {
-        try {
-            Destination d = I2PClientFactory.createClient().createDestination(new FileOutputStream(privKeyFile));
-            FileOutputStream fos = new FileOutputStream(destinationFile);
-            d.writeBytes(fos);
-            fos.flush();
-            fos.close();
-            return true;
-        } catch (IOException ioe) {
-            _log.error("Error generating keys", ioe);
-        } catch (I2PException ipe) {
-            _log.error("Error generating keys", ipe);
-        }
-        return false;
-    }
-
-    /** required by {@link I2PSessionListener I2PSessionListener} to notify of disconnect */
-    public void disconnected(I2PSession session) {
-        _log.debug("Disconnected");
-    }
-
-    /** required by {@link I2PSessionListener I2PSessionListener} to notify of error */
-    public void errorOccurred(I2PSession session, String message, Throwable error) {
-        _log.debug("Error occurred: " + message, error);
-    }
-
-    /** required by {@link I2PSessionListener I2PSessionListener} to notify of abuse */
-    public void reportAbuse(I2PSession session, int severity) {
-        _log.debug("Abuse reported of severity " + severity);
-    }
-}
-
--- a/apps/desktopgui/build.xml
+++ b/apps/desktopgui/build.xml
@ -9,6 +9,7 @@
    <property name="javadoc" value="javadoc"/>

 	<property name="javac.compilerargs" value=""/>
+	<property name="require.gettext" value="true" />

 	<target name="init">
 		<mkdir dir="${build}"/>
@ -29,8 +30,7 @@
            <compilerarg line="${javac.compilerargs}" />
            <classpath>
                <pathelement location="../../core/java/build/i2p.jar" />
-                <!-- doesn't matter if we're not on win32, we just need the java classes, not the platform-dependent code -->
-                <pathelement location="../../installer/lib/wrapper/win32/wrapper.jar" />
+                <pathelement location="../../installer/lib/wrapper/all/wrapper.jar" />
            	<pathelement location="../../router/java/build/router.jar" />
            </classpath>
 		</javac>
@ -39,17 +39,20 @@
        </copy>
 	</target>

-	<target name="jar" depends="compile">
-        <exec executable="sh" osfamily="unix" failifexecutionfails="true" >
+	<target name="bundle" >
+        <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
            <arg value="./bundle-messages.sh" />
        </exec>
-        <exec executable="sh" osfamily="mac" failifexecutionfails="true" >
+        <exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="${require.gettext}" >
            <arg value="./bundle-messages.sh" />
        </exec>
 		<!-- multi-lang is optional -->
        <exec executable="sh" osfamily="windows" failifexecutionfails="false" >
            <arg value="./bundle-messages.sh" />
        </exec>
+	</target>
+
+        <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
            <arg value="list" />
            <arg value="changed" />
@ -61,6 +64,11 @@
            <arg value="[:space:]" />
            <arg value="," />
        </exec>
+	</target>
+
+	<target name="jar" depends="compile, bundle, listChangedFiles" unless="jar.uptodate" >
+		<!-- set if unset -->
+		<property name="workspace.changes.tr" value="" />
 		<jar basedir="${build}" destfile="${dist}/${jar}">
 			<manifest>
 				<attribute name="Main-Class" value="net.i2p.desktopgui.Main"/>
@ -71,6 +79,20 @@
 		</jar>
 	</target>

+    <target name="jarUpToDate">
+        <uptodate property="jar.uptodate" targetfile="${dist}/${jar}" >
+            <srcfiles dir= "." includes="build/**/*.class" />
+        </uptodate>
+        <condition property="shouldListChanges" >
+            <and>
+                <not>
+                    <isset property="jar.uptodate" />
+                </not>
+                <isset property="mtn.available" />
+            </and>
+        </condition>
+    </target>
+
    <target name="javadoc">
        <mkdir dir="${build}" />
        <mkdir dir="${build}/${javadoc}" />
@ -88,15 +110,15 @@
    </target>

    <target name="poupdate">
-        <exec executable="sh" osfamily="unix" failifexecutionfails="true" >
+        <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="true" >
            <arg value="./bundle-messages.sh" />
            <arg value="-p" />
        </exec>
-        <exec executable="sh" osfamily="mac" failifexecutionfails="true" >
+        <exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="true" >
            <arg value="./bundle-messages.sh" />
            <arg value="-p" />
        </exec>
-        <exec executable="sh" osfamily="windows" failifexecutionfails="true" >
+        <exec executable="sh" osfamily="windows" failifexecutionfails="true" failonerror="true" >
            <arg value="./bundle-messages.sh" />
            <arg value="-p" />
        </exec>
--- a/apps/desktopgui/bundle-messages.sh
+++ b/apps/desktopgui/bundle-messages.sh
@ -13,6 +13,7 @@
 CLASS=net.i2p.desktopgui.messages
 TMPFILE=build/javafiles.txt
 export TZ=UTC
+RC=0

 if [ "$1" = "-p" ]
 then
@ -76,15 +77,17 @@ do
 		         -o ${i}t
 		if [ $? -ne 0 ]
 		then
-			echo 'Warning - xgettext failed, not updating translations'
+			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 'Warning - msgmerge failed, not updating translations'
+			echo "ERROR - msgmerge failed on ${i}, not updating translations"
 			rm -f ${i}t
+			RC=1
 			break
 		fi
 		rm -f ${i}t
@ -101,11 +104,13 @@ do
        msgfmt --java --statistics -r $CLASS -l $LG -d build $i
        if [ $? -ne 0 ]
        then
-            echo 'Warning - msgfmt failed, not updating translations'
+            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 -name messages_${LG}.class -exec rm -f {} \;
+            RC=1
            break
        fi
    fi
 done
 rm -f $TMPFILE
-# todo: return failure
-exit 0
+exit $RC
--- a/apps/desktopgui/locale/messages_cs.po
+++ b/apps/desktopgui/locale/messages_cs.po
@ -0,0 +1,55 @@
+# 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:
+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: 2012-02-12 19:44+0000\n"
+"Last-Translator: Waseihou Watashi <waseihou@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.net/projects/p/I2P/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "Spustit I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P startuje!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Startuji"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Spouštím I2P Browser"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Nastavuji desktopgui"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "Restart I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "Zastavit I2P"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Nastavení ikony na liště (tray icon)"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "Zapnout ikonu na liště?"
--- a/apps/desktopgui/locale/messages_da.po
+++ b/apps/desktopgui/locale/messages_da.po
@ -0,0 +1,57 @@
+# 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
+# 
+#   <kia___@hushmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2011-07-12 19:41+0000\n"
+"Last-Translator: KIA <kia___@hushmail.com>\n"
+"Language-Team: Danish (http://www.transifex.net/projects/p/I2P/team/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "Start I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P starter nu!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Starter"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Start I2P Browseren"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Konfigurer desktopgui"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "Genstart I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "Stop I2P"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Konfiguration af processbar ikonet"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "Skal processbar ikonet være aktivt?"
+
+
--- a/apps/desktopgui/locale/messages_it.po
+++ b/apps/desktopgui/locale/messages_it.po
@ -0,0 +1,57 @@
+# 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
+# 
+#   <jokjok@hotmail.it>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2011-06-09 17:09+0000\n"
+"Last-Translator: mkkid <jokjok@hotmail.it>\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/I2P/team/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "Avvia I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "Avvio di I2P in corso!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Avvio"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Avvia il Browser I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Configura desktopgui"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "Riavvia I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "Ferma I2P"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Configurazione dell'icona nell'Area di notifica"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "Vuoi che l'icona nell'Area di notifica venga abilitata?"
+
+
--- a/apps/desktopgui/locale/messages_pl.po
+++ b/apps/desktopgui/locale/messages_pl.po
@ -0,0 +1,57 @@
+# 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
+# 
+#   <b790979@klzlk.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2011-05-25 18:36+0000\n"
+"Last-Translator: PolishAnon <b790979@klzlk.com>\n"
+"Language-Team: Polish (http://www.transifex.net/projects/p/I2P/team/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "Uruchom I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "Uruchamianie I2P!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Uruchamianie"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Uruchom Przeglądarke I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Skonfiguruj intrefejs pulpitu (desktopgui)"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "Zrestartuj I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "Zatrzymaj I2P"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Konfiguracja ikony zasobnika"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "Czy ikona zasobnika powinna być aktywna?"
+
+
--- a/apps/desktopgui/locale/messages_sv.po
+++ b/apps/desktopgui/locale/messages_sv.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:
+# 123hund123 <M8R-ra4r1r@mailinator.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2011-03-22 15:49+0000\n"
+"Last-Translator: 123hund123 <M8R-ra4r1r@mailinator.com>\n"
+"Language-Team: Swedish (Sweden) (http://www.transifex.net/projects/p/I2P/language/sv_SE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv_SE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "Starta I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P startas!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Startar"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Öppna I2P browser"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Konfigurera desktopgui"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "Starta om I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "Stoppar I2P"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Ikonpanelskonfiguration"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "Ska ikonpanelen vara aktiverad?"
--- a/apps/desktopgui/locale/messages_uk.po
+++ b/apps/desktopgui/locale/messages_uk.po
@ -0,0 +1,57 @@
+# 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
+# 
+#   <gribua@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2011-06-19 14:01+0000\n"
+"Last-Translator: Pharmasolin <gribua@gmail.com>\n"
+"Language-Team: Ukrainian (Ukraine) (http://www.transifex.net/projects/p/I2P/team/uk_UA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk_UA\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "Запустити I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P запускається!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Запускається"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Запустити I2P Браузер"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Настроїти вигляд інтерфейсу"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "Перезапустити I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "Зупинити I2P"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Настройка трей-іконки"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "Чм повинна трей-іконка бути включена?"
+
+
--- a/apps/desktopgui/locale/messages_vi.po
+++ b/apps/desktopgui/locale/messages_vi.po
@ -0,0 +1,57 @@
+# 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
+# 
+# dich_tran <tran.nathan@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2011-04-12 06:13+0000\n"
+"Last-Translator: dich_tran <tran.nathan@gmail.com>\n"
+"Language-Team: Vietnamese (http://www.transifex.net/projects/p/I2P/team/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "Khởi động I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P đang bắt đầu"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Bắt đầu"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Kích hoạt trình duyệt I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Cấu hình giao diện"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "Khởi động lại I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "Ngưng I2P"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Cấu hình tray icon"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "Cần dùng tray icon?"
+
+
--- a/apps/desktopgui/locale/messages_zh.po
+++ b/apps/desktopgui/locale/messages_zh.po
@ -1,14 +1,23 @@
+# 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
+# 
+# ducki2p <ducki2p@gmail.com>, 2011.
+# walking <walking@i2pmail.org>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-16 17:10+0000\n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: \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-24 09:18+0000\n"
+"Last-Translator: walking <walking@i2pmail.org>\n"
+"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/I2P/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"

 #: src/net/i2p/desktopgui/ExternalTrayManager.java:23
 msgid "Start I2P"
@ -28,7 +37,7 @@ msgstr "正在启动I2P浏览器"

 #: src/net/i2p/desktopgui/InternalTrayManager.java:50
 msgid "Configure desktopgui"
-msgstr "界面设置"
+msgstr "设置desktopgui"

 #: src/net/i2p/desktopgui/InternalTrayManager.java:67
 msgid "Restart I2P"
@ -38,13 +47,12 @@ msgstr "重启 I2P"
 msgid "Stop I2P"
 msgstr "停止 I2P"

-#. Translate interface
-#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:26
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "托盘图标配置"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
 msgid "Should tray icon be enabled?"
-msgstr "显示托盘图标。"
+msgstr "是否启用托盘图标？"

-#~ msgid "Browser not found"
-#~ msgstr "Browser niet gevonden"
-#~ msgid "The default browser for your system was not found."
-#~ msgstr "De standaard webbrowser voor je systeem werd niet gevonden."

--- a/apps/i2psnark/_icons/application.png
+++ b/apps/i2psnark/_icons/application.png
--- a/apps/i2psnark/_icons/cancel.png
+++ b/apps/i2psnark/_icons/cancel.png
--- a/apps/i2psnark/_icons/cd.png
+++ b/apps/i2psnark/_icons/cd.png
--- a/apps/i2psnark/_icons/clock.png
+++ b/apps/i2psnark/_icons/clock.png
--- a/apps/i2psnark/_icons/clock_red.png
+++ b/apps/i2psnark/_icons/clock_red.png
--- a/apps/i2psnark/_icons/compress.png
+++ b/apps/i2psnark/_icons/compress.png
--- a/apps/i2psnark/_icons/film.png
+++ b/apps/i2psnark/_icons/film.png
--- a/apps/i2psnark/_icons/folder.png
+++ b/apps/i2psnark/_icons/folder.png
--- a/apps/i2psnark/_icons/html.png
+++ b/apps/i2psnark/_icons/html.png
--- a/apps/i2psnark/_icons/magnet.png
+++ b/apps/i2psnark/_icons/magnet.png
--- a/apps/i2psnark/_icons/music.png
+++ b/apps/i2psnark/_icons/music.png
--- a/apps/i2psnark/_icons/package.png
+++ b/apps/i2psnark/_icons/package.png
--- a/apps/i2psnark/_icons/page.png
+++ b/apps/i2psnark/_icons/page.png
--- a/apps/i2psnark/_icons/page_white.png
+++ b/apps/i2psnark/_icons/page_white.png
--- a/apps/i2psnark/_icons/page_white_acrobat.png
+++ b/apps/i2psnark/_icons/page_white_acrobat.png
--- a/apps/i2psnark/_icons/photo.png
+++ b/apps/i2psnark/_icons/photo.png
--- a/apps/i2psnark/_icons/plugin.png
+++ b/apps/i2psnark/_icons/plugin.png
--- a/apps/i2psnark/_icons/tick.png
+++ b/apps/i2psnark/_icons/tick.png
--- a/apps/i2psnark/java/build.xml
+++ b/apps/i2psnark/java/build.xml
@ -19,10 +19,14 @@
                <pathelement location="../../ministreaming/java/build/obj" />
                <pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" />
                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
+                <pathelement location="../../jetty/jettylib/jetty-util.jar" />
            </classpath>
        </depend>
    </target>
+
    <property name="javac.compilerargs" value="" />
+    <property name="require.gettext" value="true" />
+
    <target name="compile" depends="depend">
        <mkdir dir="./build" />
        <mkdir dir="./build/obj" />
@ -31,12 +35,12 @@
            debug="true" deprecation="on" source="1.5" target="1.5" 
            destdir="./build/obj" 
            includeAntRuntime="false"
-            classpath="../../../core/java/build/i2p.jar:../../jetty/jettylib/org.mortbay.jetty.jar:../../jetty/jettylib/javax.servlet.jar:../../ministreaming/java/build/mstreaming.jar" >
+            classpath="../../../core/java/build/i2p.jar:../../jetty/jettylib/org.mortbay.jetty.jar:../../jetty/jettylib/javax.servlet.jar:../../jetty/jettylib/jetty-util.jar:../../ministreaming/java/build/mstreaming.jar" >
            <compilerarg line="${javac.compilerargs}" />
        </javac>
    </target>

-    <target name="jar" depends="builddep, compile, jarUpToDate" unless="jar.uptodate" >
+    <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
            <arg value="list" />
            <arg value="changed" />
@ -48,10 +52,17 @@
            <arg value="[:space:]" />
            <arg value="," />
        </exec>
+    </target>
+
+    <target name="jar" depends="builddep, compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
+        <!-- set if unset -->
+        <property name="workspace.changes.tr" value="" />
        <jar destfile="./build/i2psnark.jar" basedir="./build/obj" includes="**/*.class" excludes="**/I2PSnarkServlet*.class **/messages_*.class">
            <manifest>
                <attribute name="Main-Class" value="org.klomp.snark.Snark" />
                <attribute name="Class-Path" value="i2p.jar mstreaming.jar streaming.jar" />
+                <attribute name="Implementation-Version" value="${full.version}" />
+                <attribute name="Built-By" value="${build.built-by}" />
                <attribute name="Build-Date" value="${build.timestamp}" />
                <attribute name="Base-Revision" value="${workspace.version}" />
                <attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
@ -63,6 +74,17 @@
        <uptodate property="jar.uptodate" targetfile="build/i2psnark.jar" >
            <srcfiles dir= "build/obj" includes="**/*.class" excludes="**/I2PSnarkServlet*.class **/messages_*.class" />
        </uptodate>
+        <condition property="shouldListChanges" >
+            <and>
+                <not>
+                    <isset property="jar.uptodate" />
+                </not>
+                <not>
+                    <isset property="wjar.uptodate" />
+                </not>
+                <isset property="mtn.available" />
+            </and>
+        </condition>
    </target>    

    <!-- Ideally we would include
@ -72,11 +94,19 @@
      -  So we must continue to duplicate everything in the war.
          <classes dir="./build/obj" includes="**/I2PSnarkServlet*.class" />
     -->
-    <target name="war" depends="jar, bundle, warUpToDate" unless="war.uptodate" > 
-        <war destfile="../i2psnark.war" webxml="../web.xml" basedir="../" includes="_icons/*" >
+    <target name="war" depends="jar, bundle, warUpToDate, listChangedFiles" unless="war.uptodate" > 
+        <!-- set if unset -->
+        <property name="workspace.changes.tr" value="" />
+        <copy todir="build/icons/.icons" >
+            <fileset dir="../icons/" />
+        </copy>
+        <war destfile="../i2psnark.war" webxml="../web.xml" >
          <!-- include only the web stuff, as of 0.7.12 the router will add i2psnark.jar to the classpath for the war -->
          <classes dir="./build/obj" includes="**/web/*.class" />
+            <fileset dir="build/icons/" />
            <manifest>
+                <attribute name="Implementation-Version" value="${full.version}" />
+                <attribute name="Built-By" value="${build.built-by}" />
                <attribute name="Build-Date" value="${build.timestamp}" />
                <attribute name="Base-Revision" value="${workspace.version}" />
                <attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
@ -86,17 +116,17 @@
    
    <target name="warUpToDate">
        <uptodate property="war.uptodate" targetfile="../i2psnark.war" >
-            <srcfiles dir= "." includes="build/obj/org/klomp/snark/web/*.class ../_icons/* ../web.xml" />
+            <srcfiles dir= "." includes="build/obj/org/klomp/snark/web/*.class ../icons/* ../web.xml" />
        </uptodate>
    </target>
    
    <target name="bundle" depends="compile">
        <!-- 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" >
+        <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
            <arg value="./bundle-messages.sh" />
        </exec>
-        <exec executable="sh" osfamily="mac" failifexecutionfails="true" >
+        <exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="${require.gettext}" >
            <arg value="./bundle-messages.sh" />
        </exec>
 		<!-- multi-lang is optional -->
@ -107,15 +137,15 @@

    <target name="poupdate" depends="builddep, compile">
        <!-- Update the messages_*.po files.  -->
-        <exec executable="sh" osfamily="unix" failifexecutionfails="true" >
+        <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="true" >
            <arg value="./bundle-messages.sh" />
            <arg value="-p" />
        </exec>
-        <exec executable="sh" osfamily="mac" failifexecutionfails="true" >
+        <exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="true" >
            <arg value="./bundle-messages.sh" />
            <arg value="-p" />
        </exec>
-        <exec executable="sh" osfamily="windows" failifexecutionfails="true" >
+        <exec executable="sh" osfamily="windows" failifexecutionfails="true" failonerror="true" >
            <arg value="./bundle-messages.sh" />
            <arg value="-p" />
        </exec>
--- a/apps/i2psnark/java/bundle-messages.sh
+++ b/apps/i2psnark/java/bundle-messages.sh
@ -12,6 +12,7 @@
 CLASS=org.klomp.snark.web.messages
 TMPFILE=build/javafiles.txt
 export TZ=UTC
+RC=0

 if [ "$1" = "-p" ]
 then
@ -67,15 +68,17 @@ do
 		         -o ${i}t
 		if [ $? -ne 0 ]
 		then
-			echo 'Warning - xgettext failed, not updating translations'
+			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 'Warning - msgmerge failed, not updating translations'
+			echo "ERROR - msgmerge failed on ${i}, not updating translations"
 			rm -f ${i}t
+			RC=1
 			break
 		fi
 		rm -f ${i}t
@ -92,11 +95,13 @@ do
        msgfmt --java --statistics -r $CLASS -l $LG -d build/obj $i
        if [ $? -ne 0 ]
        then
-            echo 'Warning - msgfmt failed, not updating translations'
+            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
-# todo: return failure
-exit 0
+exit $RC
--- a/apps/i2psnark/java/src/org/klomp/snark/ExtensionHandler.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/ExtensionHandler.java
@ -1,7 +1,6 @@
 package org.klomp.snark;

 import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
@ -15,7 +14,6 @@ import net.i2p.util.Log;
 import org.klomp.snark.bencode.BDecoder;
 import org.klomp.snark.bencode.BEncoder;
 import org.klomp.snark.bencode.BEValue;
-import org.klomp.snark.bencode.InvalidBEncodingException;

 /**
 * REF: BEP 10 Extension Protocol
@ -24,8 +22,6 @@ import org.klomp.snark.bencode.InvalidBEncodingException;
 */
 abstract class ExtensionHandler {

-    private static final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(ExtensionHandler.class);
-
    public static final int ID_HANDSHAKE = 0;
    public static final int ID_METADATA = 1;
    public static final String TYPE_METADATA = "ut_metadata";
@ -39,15 +35,19 @@ abstract class ExtensionHandler {

  /**
   *  @param metasize -1 if unknown
+   *  @param pexAndMetadata advertise these capabilities
   *  @return bencoded outgoing handshake message
   */
-    public static byte[] getHandshake(int metasize) {
+    public static byte[] getHandshake(int metasize, boolean pexAndMetadata) {
        Map<String, Object> handshake = new HashMap();
        Map<String, Integer> m = new HashMap();
-        m.put(TYPE_METADATA, Integer.valueOf(ID_METADATA));
-        m.put(TYPE_PEX, Integer.valueOf(ID_PEX));
-        if (metasize >= 0)
-            handshake.put("metadata_size", Integer.valueOf(metasize));
+        if (pexAndMetadata) {
+            m.put(TYPE_METADATA, Integer.valueOf(ID_METADATA));
+            m.put(TYPE_PEX, Integer.valueOf(ID_PEX));
+            if (metasize >= 0)
+                handshake.put("metadata_size", Integer.valueOf(metasize));
+        }
+        // include the map even if empty so the far-end doesn't NPE
        handshake.put("m", m);
        handshake.put("p", Integer.valueOf(6881));
        handshake.put("v", "I2PSnark");
@ -56,21 +56,22 @@ abstract class ExtensionHandler {
    }

    public static void handleMessage(Peer peer, PeerListener listener, int id, byte[] bs) {
-        if (_log.shouldLog(Log.INFO))
-            _log.info("Got extension msg " + id + " length " + bs.length + " from " + peer);
+        Log log = I2PAppContext.getGlobalContext().logManager().getLog(ExtensionHandler.class);
+        if (log.shouldLog(Log.INFO))
+            log.info("Got extension msg " + id + " length " + bs.length + " from " + peer);
        if (id == ID_HANDSHAKE)
-            handleHandshake(peer, listener, bs);
+            handleHandshake(peer, listener, bs, log);
        else if (id == ID_METADATA)
-            handleMetadata(peer, listener, bs);
+            handleMetadata(peer, listener, bs, log);
        else if (id == ID_PEX)
-            handlePEX(peer, listener, bs);
-        else if (_log.shouldLog(Log.INFO))
-            _log.info("Unknown extension msg " + id + " from " + peer);
+            handlePEX(peer, listener, bs, log);
+        else if (log.shouldLog(Log.INFO))
+            log.info("Unknown extension msg " + id + " from " + peer);
    }

-    private static void handleHandshake(Peer peer, PeerListener listener, byte[] bs) {
-        if (_log.shouldLog(Log.DEBUG))
-            _log.debug("Got handshake msg from " + peer);
+    private static void handleHandshake(Peer peer, PeerListener listener, byte[] bs, Log log) {
+        if (log.shouldLog(Log.DEBUG))
+            log.debug("Got handshake msg from " + peer);
        try {
            // this throws NPE on missing keys
            InputStream is = new ByteArrayInputStream(bs);
@ -81,20 +82,20 @@ abstract class ExtensionHandler {
            Map<String, BEValue> msgmap = map.get("m").getMap();

            if (msgmap.get(TYPE_PEX) != null) {
-                if (_log.shouldLog(Log.WARN))
-                    _log.debug("Peer supports PEX extension: " + peer);
+                if (log.shouldLog(Log.DEBUG))
+                    log.debug("Peer supports PEX extension: " + peer);
                // peer state calls peer listener calls sendPEX()
            }

            MagnetState state = peer.getMagnetState();

            if (msgmap.get(TYPE_METADATA) == null) {
-                if (_log.shouldLog(Log.WARN))
-                    _log.debug("Peer does not support metadata extension: " + peer);
+                if (log.shouldLog(Log.DEBUG))
+                    log.debug("Peer does not support metadata extension: " + peer);
                // drop if we need metainfo and we haven't found anybody yet
                synchronized(state) {
                    if (!state.isInitialized()) {
-                        _log.debug("Dropping peer, we need metadata! " + peer);
+                        log.debug("Dropping peer, we need metadata! " + peer);
                        peer.disconnect();
                    }
                }
@ -103,20 +104,20 @@ abstract class ExtensionHandler {

            BEValue msize = map.get("metadata_size");
            if (msize == null) {
-                if (_log.shouldLog(Log.WARN))
-                    _log.debug("Peer does not have the metainfo size yet: " + peer);
+                if (log.shouldLog(Log.DEBUG))
+                    log.debug("Peer does not have the metainfo size yet: " + peer);
                // drop if we need metainfo and we haven't found anybody yet
                synchronized(state) {
                    if (!state.isInitialized()) {
-                        _log.debug("Dropping peer, we need metadata! " + peer);
+                        log.debug("Dropping peer, we need metadata! " + peer);
                        peer.disconnect();
                    }
                }
                return;
            }
            int metaSize = msize.getInt();
-            if (_log.shouldLog(Log.WARN))
-                _log.debug("Got the metainfo size: " + metaSize);
+            if (log.shouldLog(Log.DEBUG))
+                log.debug("Got the metainfo size: " + metaSize);

            int remaining;
            synchronized(state) {
@ -125,21 +126,21 @@ abstract class ExtensionHandler {

                if (state.isInitialized()) {
                    if (state.getSize() != metaSize) {
-                        if (_log.shouldLog(Log.WARN))
-                            _log.debug("Wrong metainfo size " + metaSize + " from: " + peer);
+                        if (log.shouldLog(Log.DEBUG))
+                            log.debug("Wrong metainfo size " + metaSize + " from: " + peer);
                        peer.disconnect();
                        return;
                    }
                } else {
                    // initialize it
                    if (metaSize > MAX_METADATA_SIZE) {
-                        if (_log.shouldLog(Log.WARN))
-                            _log.debug("Huge metainfo size " + metaSize + " from: " + peer);
+                        if (log.shouldLog(Log.DEBUG))
+                            log.debug("Huge metainfo size " + metaSize + " from: " + peer);
                        peer.disconnect(false);
                        return;
                    }
-                    if (_log.shouldLog(Log.INFO))
-                        _log.info("Initialized state, metadata size = " + metaSize + " from " + peer);
+                    if (log.shouldLog(Log.INFO))
+                        log.info("Initialized state, metadata size = " + metaSize + " from " + peer);
                    state.initialize(metaSize);
                }
                remaining = state.chunksRemaining();
@ -152,13 +153,13 @@ abstract class ExtensionHandler {
                synchronized(state) {
                    chk = state.getNextRequest();
                }
-                if (_log.shouldLog(Log.INFO))
-                    _log.info("Request chunk " + chk + " from " + peer);
+                if (log.shouldLog(Log.INFO))
+                    log.info("Request chunk " + chk + " from " + peer);
                sendRequest(peer, chk);
            }
        } catch (Exception e) {
-            if (_log.shouldLog(Log.WARN))
-                _log.warn("Handshake exception from " + peer, e);
+            if (log.shouldLog(Log.WARN))
+                log.warn("Handshake exception from " + peer, e);
        }
    }

@ -166,15 +167,13 @@ abstract class ExtensionHandler {
    private static final int TYPE_DATA = 1;
    private static final int TYPE_REJECT = 2;

-    private static final int CHUNK_SIZE = 16*1024;
-
    /**
     * REF: BEP 9
     * @since 0.8.4
     */
-    private static void handleMetadata(Peer peer, PeerListener listener, byte[] bs) {
-        if (_log.shouldLog(Log.DEBUG))
-            _log.debug("Got metadata msg from " + peer);
+    private static void handleMetadata(Peer peer, PeerListener listener, byte[] bs, Log log) {
+        if (log.shouldLog(Log.DEBUG))
+            log.debug("Got metadata msg from " + peer);
        try {
            InputStream is = new ByteArrayInputStream(bs);
            BDecoder dec = new BDecoder(is);
@ -185,8 +184,8 @@ abstract class ExtensionHandler {

            MagnetState state = peer.getMagnetState();
            if (type == TYPE_REQUEST) {
-                if (_log.shouldLog(Log.DEBUG))
-                    _log.debug("Got request for " + piece + " from: " + peer);
+                if (log.shouldLog(Log.DEBUG))
+                    log.debug("Got request for " + piece + " from: " + peer);
                byte[] pc;
                synchronized(state) {
                    pc = state.getChunk(piece);
@ -197,8 +196,8 @@ abstract class ExtensionHandler {
                listener.uploaded(peer, pc.length);
            } else if (type == TYPE_DATA) {
                int size = map.get("total_size").getInt();
-                if (_log.shouldLog(Log.DEBUG))
-                    _log.debug("Got data for " + piece + " length " + size + " from: " + peer);
+                if (log.shouldLog(Log.DEBUG))
+                    log.debug("Got data for " + piece + " length " + size + " from: " + peer);
                boolean done;
                int chk = -1;
                synchronized(state) {
@ -207,14 +206,14 @@ abstract class ExtensionHandler {
                    int len = is.available();
                    if (len != size) {
                        // probably fatal
-                        if (_log.shouldLog(Log.WARN))
-                            _log.warn("total_size " + size + " but avail data " + len);
+                        if (log.shouldLog(Log.WARN))
+                            log.warn("total_size " + size + " but avail data " + len);
                    }
                    peer.downloaded(len);
                    listener.downloaded(peer, len);
                    done = state.saveChunk(piece, bs, bs.length - len, len);
-                    if (_log.shouldLog(Log.INFO))
-                        _log.info("Got chunk " + piece + " from " + peer);
+                    if (log.shouldLog(Log.INFO))
+                        log.info("Got chunk " + piece + " from " + peer);
                    if (!done)
                        chk = state.getNextRequest();
                }
@ -223,26 +222,26 @@ abstract class ExtensionHandler {
                    // Done!
                    // PeerState will call the listener (peer coord), who will
                    // check to see if the MagnetState has it
-                    if (_log.shouldLog(Log.WARN))
-                        _log.warn("Got last chunk from " + peer);
+                    if (log.shouldLog(Log.WARN))
+                        log.warn("Got last chunk from " + peer);
                } else {
                    // get the next chunk
-                    if (_log.shouldLog(Log.INFO))
-                        _log.info("Request chunk " + chk + " from " + peer);
+                    if (log.shouldLog(Log.INFO))
+                        log.info("Request chunk " + chk + " from " + peer);
                    sendRequest(peer, chk);
                }
            } else if (type == TYPE_REJECT) {
-                if (_log.shouldLog(Log.WARN))
-                    _log.warn("Got reject msg from " + peer);
+                if (log.shouldLog(Log.WARN))
+                    log.warn("Got reject msg from " + peer);
                peer.disconnect(false);
            } else {
-                if (_log.shouldLog(Log.WARN))
-                    _log.warn("Got unknown metadata msg from " + peer);
+                if (log.shouldLog(Log.WARN))
+                    log.warn("Got unknown metadata msg from " + peer);
                peer.disconnect(false);
            }
        } catch (Exception e) {
-            if (_log.shouldLog(Log.WARN))
-                _log.info("Metadata ext. msg. exception from " + peer, e);
+            if (log.shouldLog(Log.INFO))
+                log.info("Metadata ext. msg. exception from " + peer, e);
            // fatal ?
            peer.disconnect(false);
        }
@ -252,9 +251,11 @@ abstract class ExtensionHandler {
        sendMessage(peer, TYPE_REQUEST, piece);
    }

+  /****
    private static void sendReject(Peer peer, int piece) {
        sendMessage(peer, TYPE_REJECT, piece);
    }
+  ****/

    /** REQUEST and REJECT are the same except for message type */
    private static void sendMessage(Peer peer, int type, int piece) {
@ -267,8 +268,8 @@ abstract class ExtensionHandler {
            peer.sendExtension(hisMsgCode, payload);
        } catch (Exception e) {
            // NPE, no metadata capability
-            if (_log.shouldLog(Log.WARN))
-                _log.info("Metadata send req msg exception to " + peer, e);
+            //if (log.shouldLog(Log.INFO))
+            //    log.info("Metadata send req msg exception to " + peer, e);
        }
    }

@ -286,8 +287,8 @@ abstract class ExtensionHandler {
            peer.sendExtension(hisMsgCode, payload);
        } catch (Exception e) {
            // NPE, no metadata caps
-            if (_log.shouldLog(Log.WARN))
-                _log.info("Metadata send piece msg exception to " + peer, e);
+            //if (log.shouldLog(Log.INFO))
+            //    log.info("Metadata send piece msg exception to " + peer, e);
        }
    }

@ -301,9 +302,9 @@ abstract class ExtensionHandler {
     * added.f and dropped unsupported
     * @since 0.8.4
     */
-    private static void handlePEX(Peer peer, PeerListener listener, byte[] bs) {
-        if (_log.shouldLog(Log.DEBUG))
-            _log.debug("Got PEX msg from " + peer);
+    private static void handlePEX(Peer peer, PeerListener listener, byte[] bs, Log log) {
+        if (log.shouldLog(Log.DEBUG))
+            log.debug("Got PEX msg from " + peer);
        try {
            InputStream is = new ByteArrayInputStream(bs);
            BDecoder dec = new BDecoder(is);
@ -325,8 +326,8 @@ abstract class ExtensionHandler {
            // could include ourselves, listener must remove
            listener.gotPeers(peer, peers);
        } catch (Exception e) {
-            if (_log.shouldLog(Log.WARN))
-                _log.info("PEX msg exception from " + peer, e);
+            if (log.shouldLog(Log.INFO))
+                log.info("PEX msg exception from " + peer, e);
            //peer.disconnect(false);
        }
    }
@ -353,8 +354,8 @@ abstract class ExtensionHandler {
            peer.sendExtension(hisMsgCode, payload);
        } catch (Exception e) {
            // NPE, no PEX caps
-            if (_log.shouldLog(Log.WARN))
-                _log.info("PEX msg exception to " + peer, e);
+            //if (log.shouldLog(Log.INFO))
+            //    log.info("PEX msg exception to " + peer, e);
        }
    }

--- a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
@ -44,34 +44,34 @@ import org.klomp.snark.dht.DHT;
 * (but not multiple SnarkManagers, it is still static)
 */
 public class I2PSnarkUtil {
-    private I2PAppContext _context;
-    private Log _log;
+    private final I2PAppContext _context;
+    private final Log _log;
    
    private boolean _shouldProxy;
    private String _proxyHost;
    private int _proxyPort;
    private String _i2cpHost;
    private int _i2cpPort;
-    private Map<String, String> _opts;
+    private final Map<String, String> _opts;
    private I2PSocketManager _manager;
    private boolean _configured;
    private final Set<Hash> _shitlist;
    private int _maxUploaders;
    private int _maxUpBW;
    private int _maxConnections;
-    private File _tmpDir;
+    private final File _tmpDir;
    private int _startupDelay;
    private boolean _shouldUseOT;
+    private boolean _areFilesPublic;
+    private String _openTrackerString;
    private DHT _dht;

    public static final int DEFAULT_STARTUP_DELAY = 3;
-    public static final String PROP_USE_OPENTRACKERS = "i2psnark.useOpentrackers";
    public static final boolean DEFAULT_USE_OPENTRACKERS = true;
-    public static final String PROP_OPENTRACKERS = "i2psnark.opentrackers";
    public static final String DEFAULT_OPENTRACKERS = "http://tracker.welterde.i2p/a";
    public static final int DEFAULT_MAX_UP_BW = 8;  //KBps
    public static final int MAX_CONNECTIONS = 16; // per torrent
-    private static final String PROP_MAX_BW = "i2cp.outboundBytesPerSecond";
+    public static final String PROP_MAX_BW = "i2cp.outboundBytesPerSecond";
    //private static final boolean ENABLE_DHT = true;

    public I2PSnarkUtil(I2PAppContext ctx) {
@ -125,6 +125,8 @@ public class I2PSnarkUtil {
        // can't remove any options this way...
        if (opts != null)
            _opts.putAll(opts);
+        // this updates the session options and tells the router
+        setMaxUpBW(_maxUpBW);
        _configured = true;
    }
    
@ -134,6 +136,7 @@ public class I2PSnarkUtil {
    }
    
    /**
+     *  This updates the session options and tells the router
     *  @param limit KBps
     */
    public void setMaxUpBW(int limit) {
@ -175,6 +178,12 @@ public class I2PSnarkUtil {
    public int getMaxConnections() { return _maxConnections; }
    public int getStartupDelay() { return _startupDelay; }  
  
+    /** @since 0.8.9 */
+    public boolean getFilesPublic() { return _areFilesPublic; }
+  
+    /** @since 0.8.9 */
+    public void setFilesPublic(boolean yes) { _areFilesPublic = yes; }
+
    /**
     * Connect to the router, if we aren't already
     */
@ -210,6 +219,10 @@ public class I2PSnarkUtil {
            //    opts.setProperty("i2p.streaming.writeTimeout", "90000");
            //if (opts.getProperty("i2p.streaming.readTimeout") == null)
            //    opts.setProperty("i2p.streaming.readTimeout", "120000");
+            if (opts.getProperty("i2p.streaming.maxConnsPerMinute") == null)
+                opts.setProperty("i2p.streaming.maxConnsPerMinute", "2");
+            if (opts.getProperty("i2p.streaming.maxTotalConnsPerMinute") == null)
+                opts.setProperty("i2p.streaming.maxTotalConnsPerMinute", "6");
            _manager = I2PSocketManagerFactory.createManager(_i2cpHost, _i2cpPort, opts);
        }
        // FIXME this only instantiates krpc once, left stuck with old manager
@ -433,14 +446,13 @@ public class I2PSnarkUtil {
    
    /** @param ot non-null */
    public void setOpenTrackerString(String ot) { 
-        _opts.put(PROP_OPENTRACKERS, ot);
+        _openTrackerString = ot;
    }

    public String getOpenTrackerString() { 
-        String rv = (String) _opts.get(PROP_OPENTRACKERS);
-        if (rv == null)
+        if (_openTrackerString == null)
            return DEFAULT_OPENTRACKERS;
-        return rv;
+        return _openTrackerString;
    }

    /** comma delimited list open trackers to use as backups */
--- a/apps/i2psnark/java/src/org/klomp/snark/Message.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Message.java
@ -23,8 +23,6 @@ package org.klomp.snark;
 import java.io.DataOutputStream;
 import java.io.IOException;

-import net.i2p.util.SimpleTimer;
-
 // Used to queue outgoing connections
 // sendMessage() should be used to translate them to wire format.
 class Message
--- a/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java
@ -24,7 +24,6 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@ -34,7 +33,6 @@ import java.util.Map;

 import net.i2p.I2PAppContext;
 import net.i2p.crypto.SHA1;
-import net.i2p.data.Base64;
 import net.i2p.data.DataHelper;
 import net.i2p.util.Log;

@ -62,6 +60,7 @@ public class MetaInfo
  private final int piece_length;
  private final byte[] piece_hashes;
  private final long length;
+  private final boolean privateTorrent;
  private Map<String, BEValue> infoMap;

  /**
@ -72,7 +71,7 @@ public class MetaInfo
   *  @param lengths null for single-file torrent
   */
  MetaInfo(String announce, String name, String name_utf8, List<List<String>> files, List<Long> lengths,
-           int piece_length, byte[] piece_hashes, long length)
+           int piece_length, byte[] piece_hashes, long length, boolean privateTorrent)
  {
    this.announce = announce;
    this.name = name;
@ -83,6 +82,7 @@ public class MetaInfo
    this.piece_length = piece_length;
    this.piece_hashes = piece_hashes;
    this.length = length;
+    this.privateTorrent = privateTorrent;

    // TODO if we add a parameter for other keys
    //if (other != null) {
@ -161,6 +161,10 @@ public class MetaInfo
    else
        name_utf8 = null;

+    // BEP 27
+    val = info.get("private");
+    privateTorrent = val != null && val.getString().equals("1");
+
    val = info.get("piece length");
    if (val == null)
        throw new InvalidBEncodingException("Missing piece length number");
@ -213,7 +217,7 @@ public class MetaInfo
            if (l < oldTotal)
              throw new InvalidBEncodingException("Huge total length");

-            val = (BEValue)desc.get("path");
+            val = desc.get("path");
            if (val == null)
              throw new InvalidBEncodingException("Missing path list");
            List<BEValue> path_list = val.getList();
@ -239,7 +243,7 @@ public class MetaInfo

            m_files.add(Collections.unmodifiableList(file));
            
-            val = (BEValue)desc.get("path.utf-8");
+            val = desc.get("path.utf-8");
            if (val != null) {
                path_list = val.getList();
                path_length = path_list.size();
@ -319,6 +323,14 @@ public class MetaInfo
    return name;
  }

+  /**
+   * Is it a private torrent?
+   * @since 0.9
+   */
+  public boolean isPrivate() {
+    return privateTorrent;
+  }
+
  /**
   * Returns a list of lists of file name hierarchies or null if it is
   * a single name. It has the same size as the list returned by
@ -401,7 +413,7 @@ public class MetaInfo
 ****/
  
  private boolean fast_checkPiece(int piece, byte[] bs, int off, int length) {
-    SHA1 sha1 = new SHA1();
+    MessageDigest sha1 = SHA1.getInstance();

    sha1.update(bs, off, length);
    byte[] hash = sha1.digest();
@ -440,7 +452,7 @@ public class MetaInfo
  {
    return new MetaInfo(announce, name, name_utf8, files,
                        lengths, piece_length,
-                        piece_hashes, length);
+                        piece_hashes, length, privateTorrent);
  }

  /**
@ -476,6 +488,10 @@ public class MetaInfo
    info.put("name", name);
    if (name_utf8 != null)
        info.put("name.utf-8", name_utf8);
+    // BEP 27
+    if (privateTorrent)
+        info.put("private", "1");
+
    info.put("piece length", Integer.valueOf(piece_length));
    info.put("pieces", piece_hashes);
    if (files == null)
@ -519,18 +535,11 @@ public class MetaInfo
    }
    byte[] infoBytes = BEncoder.bencode(info);
    //_log.debug("info bencoded: [" + Base64.encode(infoBytes, true) + "]");
-    try
-      {
-        MessageDigest digest = MessageDigest.getInstance("SHA");
+        MessageDigest digest = SHA1.getInstance();
        byte hash[] = digest.digest(infoBytes);
        if (_log.shouldLog(Log.DEBUG))
            _log.debug("info hash: " + I2PSnarkUtil.toHex(hash));
        return hash;
-      }
-    catch(NoSuchAlgorithmException nsa)
-      {
-        throw new InternalError(nsa.toString());
-      }
  }

  /** @since 0.8.5 */
--- a/apps/i2psnark/java/src/org/klomp/snark/Peer.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Peer.java
@ -268,7 +268,8 @@ public class Peer implements Comparable
            if (_log.shouldLog(Log.DEBUG))
                _log.debug("Peer supports extensions, sending reply message");
            int metasize = metainfo != null ? metainfo.getInfoBytes().length : -1;
-            out.sendExtension(0, ExtensionHandler.getHandshake(metasize));
+            boolean pexAndMetadata = metainfo == null || !metainfo.isPrivate();
+            out.sendExtension(0, ExtensionHandler.getHandshake(metasize, pexAndMetadata));
        }

        if ((options & OPTION_I2P_DHT) != 0 && util.getDHT() != null) {
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerAcceptor.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerAcceptor.java
@ -130,7 +130,8 @@ public class PeerAcceptor
    }
  }

-  private static final int LOOKAHEAD_SIZE = "19".length() +
+  /** 48 */
+  private static final int LOOKAHEAD_SIZE = 1 + // chr(19)
                                            "BitTorrent protocol".length() +
                                            8 + // blank, reserved
                                            20; // infohash
@ -144,7 +145,7 @@ public class PeerAcceptor
    if (read != buf.length)
        throw new IOException("Unable to read the hash (read " + read + ")");
    byte rv[] = new byte[20];
-    System.arraycopy(buf, buf.length-rv.length-1, rv, 0, rv.length);
+    System.arraycopy(buf, buf.length-rv.length, rv, 0, rv.length);
    return rv;
  }
 }
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java
@ -21,10 +21,8 @@
 package org.klomp.snark;

 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
-import java.util.TimerTask;

 import net.i2p.I2PAppContext;

@ -32,7 +30,7 @@ import net.i2p.I2PAppContext;
 * TimerTask that checks for good/bad up/downloader. Works together
 * with the PeerCoordinator to select which Peers get (un)choked.
 */
-class PeerCheckerTask extends TimerTask
+class PeerCheckerTask implements Runnable
 {
  private static final long KILOPERSECOND = 1024*(PeerCoordinator.CHECK_PERIOD/1000);

@ -54,8 +52,6 @@ class PeerCheckerTask extends TimerTask
        List<Peer> peerList = coordinator.peerList();
        if (peerList.isEmpty() || coordinator.halted()) {
          coordinator.setRateHistory(0, 0);
-          if (coordinator.halted())
-            cancel();
          return;
        }

@ -63,9 +59,7 @@ class PeerCheckerTask extends TimerTask
        long worstdownload = Long.MAX_VALUE;
        Peer worstDownloader = null;

-        int peers = 0;
        int uploaders = 0;
-        int downloaders = 0;
        int removedCount = 0;

        long uploaded = 0;
@ -88,12 +82,8 @@ class PeerCheckerTask extends TimerTask
                continue;
              }

-            peers++;
-
            if (!peer.isChoking())
              uploaders++;
-            if (!peer.isChoked() && peer.isInteresting())
-              downloaders++;

            long upload = peer.getUploaded();
            uploaded += upload;
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java
@ -143,7 +143,7 @@ class PeerConnectionOut implements Runnable
                          }
                      }
                    if (m == null && !sendQueue.isEmpty()) {
-                      m = (Message)sendQueue.remove(0);
+                      m = sendQueue.remove(0);
                      //SimpleTimer.getInstance().removeEvent(m.expireEvent);
                    }
                  }
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
@ -342,6 +342,11 @@ public class PeerCoordinator implements PeerListener
  private int getMaxConnections() {
    if (metainfo == null)
        return 6;
+    int pieces = metainfo.getPieces();
+    if (pieces <= 2)
+        return 4;
+    if (pieces <= 5)
+        return 6;
    int size = metainfo.getPieceLength(0);
    int max = _util.getMaxConnections();
    if (size <= 512*1024 || completed())
@ -1181,6 +1186,8 @@ public class PeerCoordinator implements PeerListener
   *  @since 0.8.4
   */
  void sendPeers(Peer peer) {
+      if (metainfo != null && metainfo.isPrivate())
+          return;
      Map<String, BEValue> handshake = peer.getHandshakeMap();
      if (handshake == null)
          return;
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerMonitorTask.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerMonitorTask.java
@ -21,7 +21,6 @@
 package org.klomp.snark;

 import java.util.Iterator;
-import java.util.TimerTask;

 import net.i2p.data.DataHelper;

@ -29,7 +28,7 @@ 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.
 */
-class PeerMonitorTask extends TimerTask
+class PeerMonitorTask implements Runnable
 {
  final static long MONITOR_PERIOD = 10 * 1000; // Ten seconds.
  private static final long KILOPERSECOND = 1024 * (MONITOR_PERIOD / 1000);
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerState.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerState.java
@ -20,13 +20,10 @@

 package org.klomp.snark;

-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;

 import net.i2p.I2PAppContext;
@ -489,6 +486,13 @@ class PeerState implements DataLoader
  /** @since 0.8.2 */
  void extensionMessage(int id, byte[] bs)
  {
+      if (metainfo != null && metainfo.isPrivate() &&
+          (id == ExtensionHandler.ID_METADATA || id == ExtensionHandler.ID_PEX)) {
+          // shouldn't get this since we didn't advertise it but they could send it anyway
+          if (_log.shouldLog(Log.WARN))
+              _log.warn("Private torrent, ignoring ext msg " + id);
+          return;
+      }
      ExtensionHandler.handleMessage(peer, listener, id, bs);
      // Peer coord will get metadata from MagnetState,
      // verify, and then call gotMetaInfo()
--- a/apps/i2psnark/java/src/org/klomp/snark/Snark.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Snark.java
@ -20,20 +20,16 @@

 package org.klomp.snark;

-import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 import java.util.Random;
 import java.util.StringTokenizer;
-import java.util.Timer;
-import java.util.TimerTask;

 import net.i2p.I2PAppContext;
 import net.i2p.client.streaming.I2PServerSocket;
@ -75,10 +71,11 @@ public class Snark
  //public static int debug = NOTICE;

  // Whether or not to ask the user for commands while sharing
-  private static boolean command_interpreter = true;
+  //private static boolean command_interpreter = true;

  private static final String newline = System.getProperty("line.separator");

+/****
  private static final String copyright =
  "The Hunting of the Snark Project - Copyright (C) 2003 Mark J. Wielaard"
  + newline + newline
@ -94,10 +91,12 @@ public class Snark
  "Press return for help. Type \"quit\" and return to stop.";
  private static final String help =
  "Commands: 'info', 'list', 'quit'.";
+****/

  // String indicating main activity
  String activity = "Not started";
  
+/****
  private static class OOMListener implements I2PThread.OOMEventListener {
      public void outOfMemory(OutOfMemoryError err) {
          try {
@ -110,6 +109,7 @@ public class Snark
      }
      
  }
+****/
  
 /******** No, not maintaining a command-line client

@ -319,8 +319,6 @@ public class Snark
    id = generateID();
    debug("My peer id: " + PeerID.idencode(id), Snark.INFO);

-    int port;
-    IOException lastException = null;
 /*
 * Don't start a tunnel if the torrent isn't going to be started.
 * If we are starting,
@ -603,10 +601,12 @@ public class Snark
        _util.disconnect();
  }

+/****
  private static Snark parseArguments(String[] args)
  {
    return parseArguments(args, null, null);
  }
+****/

    // Accessors

@ -781,6 +781,26 @@ public class Snark
        return -1;
    }

+    /**
+     *  @return exact value. or -1 if no storage yet.
+     *          getNeeded() * pieceLength(0) isn't accurate if last piece
+     *          is still needed.
+     *  @since 0.8.9
+     */
+    public long getRemainingLength() {
+        if (meta != null && storage != null) {
+            long needed = storage.needed();
+            long length0 = meta.getPieceLength(0);
+            long remaining = needed * length0;
+            // fixup if last piece is needed
+            int last = meta.getPieces() - 1;
+            if (last != 0 && !storage.getBitField().get(last))
+                remaining -= length0 - meta.getPieceLength(last);
+            return remaining;
+        }
+        return -1;
+    }
+
    /**
     *  @return number of pieces still needed (magnet mode or not), or -1 if unknown
     *  @since 0.8.4
@ -893,7 +913,7 @@ public class Snark
          }
        else if (args[i].equals("--no-commands"))
          {
-            command_interpreter = false;
+            //command_interpreter = false;
            i++;
          }
        //else if (args[i].equals("--eepproxy"))
@ -1011,6 +1031,10 @@ public class Snark
    //if (debug >= INFO && t != null)
    //  t.printStackTrace();
    stopTorrent();
+    if (t != null)
+        s += ": " + t;
+    if (completeListener != null)
+        completeListener.fatal(this, s);
    throw new RuntimeException(s, t);
  }

@ -1038,10 +1062,12 @@ public class Snark
   * @since 0.8.4
   */
  public void gotMetaInfo(PeerCoordinator coordinator, MetaInfo metainfo) {
-      meta = metainfo;
      try {
-          storage = new Storage(_util, meta, this);
+          // The following two may throw IOE...
+          storage = new Storage(_util, metainfo, this);
          storage.check(rootDataDir);
+          // ... so don't set meta until here
+          meta = metainfo;
          if (completeListener != null) {
              String newName = completeListener.gotMetaInfo(this);
              if (newName != null)
@ -1057,7 +1083,7 @@ public class Snark
      }
  }

-  private boolean allocating = false;
+  //private boolean allocating = false;
  public void storageCreateFile(Storage storage, String name, long length)
  {
    //if (allocating)
@ -1065,7 +1091,7 @@ public class Snark

    //System.out.print("Creating file '" + name
    //                 + "' of length " + length + ": ");
-    allocating = true;
+    //allocating = true;
  }

  // How much storage space has been allocated
@ -1073,9 +1099,9 @@ public class Snark

  public void storageAllocated(Storage storage, long length)
  {
-    allocating = true;
+    //allocating = true;
    //System.out.print(".");
-    allocated += length;
+    //allocated += length;
    //if (allocated == meta.getTotalLength())
    //  System.out.println(); // We have all the disk space we need.
  }
@ -1085,7 +1111,7 @@ public class Snark
  private boolean prechecking = true;
  public void storageChecked(Storage storage, int num, boolean checked)
  {
-    allocating = false;
+    //allocating = false;
    if (!allChecked && !checking)
      {
        // Use the MetaInfo from the storage since our own might not
@ -1149,6 +1175,11 @@ public class Snark
     */
    public String gotMetaInfo(Snark snark);

+    /**
+     * @since 0.9
+     */
+    public void fatal(Snark snark, String error);
+
    // not really listeners but the easiest way to get back to an optional SnarkManager
    public long getSavedTorrentTime(Snark snark);
    public BitField getSavedTorrentBitField(Snark snark);
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@ -3,10 +3,13 @@ package org.klomp.snark;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@ -16,7 +19,6 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.TreeMap;
-import java.util.Collection;
 import java.util.concurrent.ConcurrentHashMap;

 import net.i2p.I2PAppContext;
@ -34,8 +36,6 @@ import net.i2p.util.SecureFileOutputStream;
 * Manage multiple snarks
 */
 public class SnarkManager implements Snark.CompleteListener {
-    private static SnarkManager _instance = new SnarkManager();
-    public static SnarkManager instance() { return _instance; }
    
    /**
     *  Map of (canonical) filename of the .torrent file to Snark instance.
@ -48,14 +48,15 @@ public class SnarkManager implements Snark.CompleteListener {
    private final Object _addSnarkLock;
    private /* FIXME final FIXME */ File _configFile;
    private Properties _config;
-    private I2PAppContext _context;
-    private Log _log;
-    private final List _messages;
-    private I2PSnarkUtil _util;
+    private final I2PAppContext _context;
+    private final Log _log;
+    private final List<String> _messages;
+    private final I2PSnarkUtil _util;
    private PeerCoordinatorSet _peerCoordinatorSet;
    private ConnectionAcceptor _connectionAcceptor;
    private Thread _monitor;
-    private boolean _running;
+    private volatile boolean _running;
+    private final Map<String, String> _trackerMap;
    
    public static final String PROP_I2CP_HOST = "i2psnark.i2cpHost";
    public static final String PROP_I2CP_PORT = "i2psnark.i2cpPort";
@ -71,17 +72,51 @@ public class SnarkManager implements Snark.CompleteListener {
    public static final String PROP_META_MAGNET_PREFIX = "i2psnark.magnet.";

    private static final String CONFIG_FILE = "i2psnark.config";
+    public static final String PROP_FILES_PUBLIC = "i2psnark.filesPublic";
    public static final String PROP_AUTO_START = "i2snark.autoStart";   // oops
    public static final String DEFAULT_AUTO_START = "false";
-    public static final String PROP_LINK_PREFIX = "i2psnark.linkPrefix";
-    public static final String DEFAULT_LINK_PREFIX = "file:///";
+    //public static final String PROP_LINK_PREFIX = "i2psnark.linkPrefix";
+    //public static final String DEFAULT_LINK_PREFIX = "file:///";
    public static final String PROP_STARTUP_DELAY = "i2psnark.startupDelay";
+    public static final String PROP_REFRESH_DELAY = "i2psnark.refreshSeconds";
    public static final String PROP_THEME = "i2psnark.theme";
    public static final String DEFAULT_THEME = "ubergine";
+    private static final String PROP_USE_OPENTRACKERS = "i2psnark.useOpentrackers";
+    public static final String PROP_OPENTRACKERS = "i2psnark.opentrackers";

    public static final int MIN_UP_BW = 2;
    public static final int DEFAULT_MAX_UP_BW = 10;
    public static final int DEFAULT_STARTUP_DELAY = 3; 
+    public static final int DEFAULT_REFRESH_DELAY_SECS = 60;
+
+    /**
+     *  "name", "announceURL=websiteURL" pairs
+     *  '=' in announceURL must be escaped as &#44;
+     */
+    private static final String DEFAULT_TRACKERS[] = { 
+//       "Postman", "http://YRgrgTLGnbTq2aZOZDJQ~o6Uk5k6TK-OZtx0St9pb0G-5EGYURZioxqYG8AQt~LgyyI~NCj6aYWpPO-150RcEvsfgXLR~CxkkZcVpgt6pns8SRc3Bi-QSAkXpJtloapRGcQfzTtwllokbdC-aMGpeDOjYLd8b5V9Im8wdCHYy7LRFxhEtGb~RL55DA8aYOgEXcTpr6RPPywbV~Qf3q5UK55el6Kex-6VCxreUnPEe4hmTAbqZNR7Fm0hpCiHKGoToRcygafpFqDw5frLXToYiqs9d4liyVB-BcOb0ihORbo0nS3CLmAwZGvdAP8BZ7cIYE3Z9IU9D1G8JCMxWarfKX1pix~6pIA-sp1gKlL1HhYhPMxwyxvuSqx34o3BqU7vdTYwWiLpGM~zU1~j9rHL7x60pVuYaXcFQDR4-QVy26b6Pt6BlAZoFmHhPcAuWfu-SFhjyZYsqzmEmHeYdAwa~HojSbofg0TMUgESRXMw6YThK1KXWeeJVeztGTz25sL8AAAA.i2p/announce.php=http://tracker.postman.i2p/"
+//       , "eBook", "http://E71FRom6PZNEqTN2Lr8P-sr23b7HJVC32KoGnVQjaX6zJiXwhJy2HsXob36Qmj81TYFZdewFZa9mSJ533UZgGyQkXo2ahctg82JKYZfDe5uDxAn1E9YPjxZCWJaFJh0S~UwSs~9AZ7UcauSJIoNtpxrtbmRNVFLqnkEDdLZi26TeucfOmiFmIWnVblLniWv3tG1boE9Abd-6j3FmYVrRucYuepAILYt6katmVNOk6sXmno1Eynrp~~MBuFq0Ko6~jsc2E2CRVYXDhGHEMdt-j6JUz5D7S2RIVzDRqQyAZLKJ7OdQDmI31przzmne1vOqqqLC~1xUumZVIvF~yOeJUGNjJ1Vx0J8i2BQIusn1pQJ6UCB~ZtZZLQtEb8EPVCfpeRi2ri1M5CyOuxN0V5ekmPHrYIBNevuTCRC26NP7ZS5VDgx1~NaC3A-CzJAE6f1QXi0wMI9aywNG5KGzOPifcsih8eyGyytvgLtrZtV7ykzYpPCS-rDfITncpn5hliPUAAAA.i2p/pub/bt/announce.php=http://de-ebook-archiv.i2p/pub/bt/"
+//       , "Gaytorrents", "http://uxPWHbK1OIj9HxquaXuhMiIvi21iK0~ZiG9d8G0840ZXIg0r6CbiV71xlsqmdnU6wm0T2LySriM0doW2gUigo-5BNkUquHwOjLROiETnB3ZR0Ml4IGa6QBPn1aAq2d9~g1r1nVjLE~pcFnXB~cNNS7kIhX1d6nLgYVZf0C2cZopEow2iWVUggGGnAA9mHjE86zLEnTvAyhbAMTqDQJhEuLa0ZYSORqzJDMkQt90MV4YMjX1ICY6RfUSFmxEqu0yWTrkHsTtRw48l~dz9wpIgc0a0T9C~eeWvmBFTqlJPtQZwntpNeH~jF7nlYzB58olgV2HHFYpVYD87DYNzTnmNWxCJ5AfDorm6AIUCV2qaE7tZtI1h6fbmGpGlPyW~Kw5GXrRfJwNvr6ajwAVi~bPVnrBwDZezHkfW4slOO8FACPR28EQvaTu9nwhAbqESxV2hCTq6vQSGjuxHeOuzBOEvRWkLKOHWTC09t2DbJ94FSqETmZopTB1ukEmaxRWbKSIaAAAA.i2p/announce.php=http://gaytorrents.i2p/"
+//       , "NickyB", "http://9On6d3cZ27JjwYCtyJJbowe054d5tFnfMjv4PHsYs-EQn4Y4mk2zRixatvuAyXz2MmRfXG-NAUfhKr0KCxRNZbvHmlckYfT-WBzwwpiMAl0wDFY~Pl8cqXuhfikSG5WrqdPfDNNIBuuznS0dqaczf~OyVaoEOpvuP3qV6wKqbSSLpjOwwAaQPHjlRtNIW8-EtUZp-I0LT45HSoowp~6b7zYmpIyoATvIP~sT0g0MTrczWhbVTUZnEkZeLhOR0Duw1-IRXI2KHPbA24wLO9LdpKKUXed05RTz0QklW5ROgR6TYv7aXFufX8kC0-DaKvQ5JKG~h8lcoHvm1RCzNqVE-2aiZnO2xH08H-iCWoLNJE-Td2kT-Tsc~3QdQcnEUcL5BF-VT~QYRld2--9r0gfGl-yDrJZrlrihHGr5J7ImahelNn9PpkVp6eIyABRmJHf2iicrk3CtjeG1j9OgTSwaNmEpUpn4aN7Kx0zNLdH7z6uTgCGD9Kmh1MFYrsoNlTp4AAAA.i2p/bittorrent/announce.php=http://nickyb.i2p/bittorrent/"
+//       , "Orion", "http://gKik1lMlRmuroXVGTZ~7v4Vez3L3ZSpddrGZBrxVriosCQf7iHu6CIk8t15BKsj~P0JJpxrofeuxtm7SCUAJEr0AIYSYw8XOmp35UfcRPQWyb1LsxUkMT4WqxAT3s1ClIICWlBu5An~q-Mm0VFlrYLIPBWlUFnfPR7jZ9uP5ZMSzTKSMYUWao3ejiykr~mtEmyls6g-ZbgKZawa9II4zjOy-hdxHgP-eXMDseFsrym4Gpxvy~3Fv9TuiSqhpgm~UeTo5YBfxn6~TahKtE~~sdCiSydqmKBhxAQ7uT9lda7xt96SS09OYMsIWxLeQUWhns-C~FjJPp1D~IuTrUpAFcVEGVL-BRMmdWbfOJEcWPZ~CBCQSO~VkuN1ebvIOr9JBerFMZSxZtFl8JwcrjCIBxeKPBmfh~xYh16BJm1BBBmN1fp2DKmZ2jBNkAmnUbjQOqWvUcehrykWk5lZbE7bjJMDFH48v3SXwRuDBiHZmSbsTY6zhGY~GkMQHNGxPMMSIAAAA.i2p/bt/announce.php=http://orion.i2p/bt/"
+//       , "anonymity", "http://8EoJZIKrWgGuDrxA3nRJs1jsPfiGwmFWL91hBrf0HA7oKhEvAna4Ocx47VLUR9retVEYBAyWFK-eZTPcvhnz9XffBEiJQQ~kFSCqb1fV6IfPiV3HySqi9U5Caf6~hC46fRd~vYnxmaBLICT3N160cxBETqH3v2rdxdJpvYt8q4nMk9LUeVXq7zqCTFLLG5ig1uKgNzBGe58iNcsvTEYlnbYcE930ABmrzj8G1qQSgSwJ6wx3tUQNl1z~4wSOUMan~raZQD60lRK70GISjoX0-D0Po9WmPveN3ES3g72TIET3zc3WPdK2~lgmKGIs8GgNLES1cXTolvbPhdZK1gxddRMbJl6Y6IPFyQ9o4-6Rt3Lp-RMRWZ2TG7j2OMcNSiOmATUhKEFBDfv-~SODDyopGBmfeLw16F4NnYednvn4qP10dyMHcUASU6Zag4mfc2-WivrOqeWhD16fVAh8MoDpIIT~0r9XmwdaVFyLcjbXObabJczxCAW3fodQUnvuSkwzAAAA.i2p/anonymityTracker/announce.php=http://anonymityweb.i2p/anonymityTracker/"
+//       , "The freak's tracker", "http://mHKva9x24E5Ygfey2llR1KyQHv5f8hhMpDMwJDg1U-hABpJ2NrQJd6azirdfaR0OKt4jDlmP2o4Qx0H598~AteyD~RJU~xcWYdcOE0dmJ2e9Y8-HY51ie0B1yD9FtIV72ZI-V3TzFDcs6nkdX9b81DwrAwwFzx0EfNvK1GLVWl59Ow85muoRTBA1q8SsZImxdyZ-TApTVlMYIQbdI4iQRwU9OmmtefrCe~ZOf4UBS9-KvNIqUL0XeBSqm0OU1jq-D10Ykg6KfqvuPnBYT1BYHFDQJXW5DdPKwcaQE4MtAdSGmj1epDoaEBUa9btQlFsM2l9Cyn1hzxqNWXELmx8dRlomQLlV4b586dRzW~fLlOPIGC13ntPXogvYvHVyEyptXkv890jC7DZNHyxZd5cyrKC36r9huKvhQAmNABT2Y~pOGwVrb~RpPwT0tBuPZ3lHYhBFYmD8y~AOhhNHKMLzea1rfwTvovBMByDdFps54gMN1mX4MbCGT4w70vIopS9yAAAA.i2p/bytemonsoon/announce.php"
+//       , "mastertracker", "http://VzXD~stRKbL3MOmeTn1iaCQ0CFyTmuFHiKYyo0Rd~dFPZFCYH-22rT8JD7i-C2xzYFa4jT5U2aqHzHI-Jre4HL3Ri5hFtZrLk2ax3ji7Qfb6qPnuYkuiF2E2UDmKUOppI8d9Ye7tjdhQVCy0izn55tBaB-U7UWdcvSK2i85sauyw3G0Gfads1Rvy5-CAe2paqyYATcDmGjpUNLoxbfv9KH1KmwRTNH6k1v4PyWYYnhbT39WfKMbBjSxVQRdi19cyJrULSWhjxaQfJHeWx5Z8Ev4bSPByBeQBFl2~4vqy0S5RypINsRSa3MZdbiAAyn5tr5slWR6QdoqY3qBQgBJFZppy-3iWkFqqKgSxCPundF8gdDLC5ddizl~KYcYKl42y9SGFHIukH-TZs8~em0~iahzsqWVRks3zRG~tlBcX2U3M2~OJs~C33-NKhyfZT7-XFBREvb8Szmd~p66jDxrwOnKaku-G6DyoQipJqIz4VHmY9-y5T8RrUcJcM-5lVoMpAAAA.i2p/announce.php=http://tracker.mastertracker.i2p/"
+//       , "Galen", "http://5jpwQMI5FT303YwKa5Rd38PYSX04pbIKgTaKQsWbqoWjIfoancFdWCShXHLI5G5ofOb0Xu11vl2VEMyPsg1jUFYSVnu4-VfMe3y4TKTR6DTpetWrnmEK6m2UXh91J5DZJAKlgmO7UdsFlBkQfR2rY853-DfbJtQIFl91tbsmjcA5CGQi4VxMFyIkBzv-pCsuLQiZqOwWasTlnzey8GcDAPG1LDcvfflGV~6F5no9mnuisZPteZKlrv~~TDoXTj74QjByWc4EOYlwqK8sbU9aOvz~s31XzErbPTfwiawiaZ0RUI-IDrKgyvmj0neuFTWgjRGVTH8bz7cBZIc3viy6ioD-eMQOrXaQL0TCWZUelRwHRvgdPiQrxdYQs7ixkajeHzxi-Pq0EMm5Vbh3j3Q9kfUFW3JjFDA-MLB4g6XnjCbM5J1rC0oOBDCIEfhQkszru5cyLjHiZ5yeA0VThgu~c7xKHybv~OMXION7V8pBKOgET7ZgAkw1xgYe3Kkyq5syAAAA.i2p/tr/announce.php=http://galen.i2p/tr/"
+       "Postman", "http://tracker2.postman.i2p/announce.php=http://tracker2.postman.i2p/"
+       ,"Welterde", "http://tracker.welterde.i2p/a=http://tracker.welterde.i2p/stats?mode=top5"
+       ,"Diftracker", "http://n--XWjHjUPjnMNrSwXA2OYXpMIUL~u4FNXnrt2HtjK3y6j~4SOClyyeKzd0zRPlixxkCe2wfBIYye3bZsaqAD8bd0QMmowxbq91WpjsPfKMiphJbePKXtYAVARiy0cqyvh1d2LyDE-6wkvgaw45hknmS0U-Dg3YTJZbAQRU2SKXgIlAbWCv4R0kDFBLEVpReDiJef3rzAWHiW8yjmJuJilkYjMwlfRjw8xx1nl2s~yhlljk1pl13jGYb0nfawQnuOWeP-ASQWvAAyVgKvZRJE2O43S7iveu9piuv7plXWbt36ef7ndu2GNoNyPOBdpo9KUZ-NOXm4Kgh659YtEibL15dEPAOdxprY0sYUurVw8OIWqrpX7yn08nbi6qHVGqQwTpxH35vkL8qrCbm-ym7oQJQnNmSDrNTyWYRFSq5s5~7DAdFDzqRPW-pX~g0zEivWj5tzkhvG9rVFgFo0bpQX3X0PUAV9Xbyf8u~v8Zbr9K1pCPqBq9XEr4TqaLHw~bfAAAA.i2p/announce.php=http://diftracker.i2p/"
+//       , "CRSTRACK", "http://b4G9sCdtfvccMAXh~SaZrPqVQNyGQbhbYMbw6supq2XGzbjU4NcOmjFI0vxQ8w1L05twmkOvg5QERcX6Mi8NQrWnR0stLExu2LucUXg1aYjnggxIR8TIOGygZVIMV3STKH4UQXD--wz0BUrqaLxPhrm2Eh9Hwc8TdB6Na4ShQUq5Xm8D4elzNUVdpM~RtChEyJWuQvoGAHY3ppX-EJJLkiSr1t77neS4Lc-KofMVmgI9a2tSSpNAagBiNI6Ak9L1T0F9uxeDfEG9bBSQPNMOSUbAoEcNxtt7xOW~cNOAyMyGydwPMnrQ5kIYPY8Pd3XudEko970vE0D6gO19yoBMJpKx6Dh50DGgybLQ9CpRaynh2zPULTHxm8rneOGRcQo8D3mE7FQ92m54~SvfjXjD2TwAVGI~ae~n9HDxt8uxOecAAvjjJ3TD4XM63Q9TmB38RmGNzNLDBQMEmJFpqQU8YeuhnS54IVdUoVQFqui5SfDeLXlSkh4vYoMU66pvBfWbAAAA.i2p/tracker/announce.php=http://crstrack.i2p/tracker/"
+//       ,"Exotrack", "http://blbgywsjubw3d2zih2giokakhe3o2cko7jtte4risb3hohbcoyva.b32.i2p/announce.php=http://exotrack.i2p/"
+    };
+    
+    /** comma delimited list of name=announceURL=baseURL for the trackers to be displayed */
+    public static final String PROP_TRACKERS = "i2psnark.trackers";
+
+    private static final SnarkManager _instance = new SnarkManager();
+
+    public static SnarkManager instance() { return _instance; }
+
    private SnarkManager() {
        _snarks = new ConcurrentHashMap();
        _magnets = new ConcurrentHashSet();
@ -93,6 +128,7 @@ public class SnarkManager implements Snark.CompleteListener {
        _configFile = new File(CONFIG_FILE);
        if (!_configFile.isAbsolute())
            _configFile = new File(_context.getConfigDir(), CONFIG_FILE);
+        _trackerMap = Collections.synchronizedMap(new TreeMap(new IgnoreCaseComparator()));
        loadConfig(null);
    }

@ -119,6 +155,7 @@ public class SnarkManager implements Snark.CompleteListener {
    public I2PSnarkUtil util() { return _util; }

    private static final int MAX_MESSAGES = 5;
+
    public void addMessage(String message) {
        synchronized (_messages) {
            _messages.add(message);
@ -130,26 +167,70 @@ public class SnarkManager implements Snark.CompleteListener {
    }
    
    /** newest last */
-    public List getMessages() {
+    public List<String> getMessages() {
        synchronized (_messages) {
            return new ArrayList(_messages);
        }
    }
    
-    public boolean shouldAutoStart() {
-        return Boolean.valueOf(_config.getProperty(PROP_AUTO_START, DEFAULT_AUTO_START+"")).booleanValue();
+    /** @since 0.9 */
+    public void clearMessages() {
+        synchronized (_messages) {
+            _messages.clear();
+        }
    }
+    
+    /**
+     *  @return default false
+     *  @since 0.8.9
+     */
+    public boolean areFilesPublic() {
+        return Boolean.valueOf(_config.getProperty(PROP_FILES_PUBLIC)).booleanValue();
+    }
+
+    public boolean shouldAutoStart() {
+        return Boolean.valueOf(_config.getProperty(PROP_AUTO_START, DEFAULT_AUTO_START)).booleanValue();
+    }
+
+/****
    public String linkPrefix() {
        return _config.getProperty(PROP_LINK_PREFIX, DEFAULT_LINK_PREFIX + getDataDir().getAbsolutePath() + File.separatorChar);
    }
-    private int getStartupDelayMinutes() { 
-	return Integer.valueOf(_config.getProperty(PROP_STARTUP_DELAY)).intValue(); 
+****/
+
+    /**
+     *  @return -1 for never
+     *  @since 0.8.9
+     */
+    public int getRefreshDelaySeconds() { 
+        try {
+	    return Integer.parseInt(_config.getProperty(PROP_REFRESH_DELAY));
+        } catch (NumberFormatException nfe) {
+            return DEFAULT_REFRESH_DELAY_SECS;
+        }
    }
+
+    private int getStartupDelayMinutes() { 
+        try {
+	    return Integer.parseInt(_config.getProperty(PROP_STARTUP_DELAY));
+        } catch (NumberFormatException nfe) {
+            return DEFAULT_STARTUP_DELAY;
+        }
+    }
+
    public File getDataDir() { 
        String dir = _config.getProperty(PROP_DIR, "i2psnark");
-        File f = new SecureDirectory(dir);
-        if (!f.isAbsolute())
-            f = new SecureDirectory(_context.getAppDir(), dir);
+        File f;
+        if (areFilesPublic())
+            f = new File(dir);
+        else
+            f = new SecureDirectory(dir);
+        if (!f.isAbsolute()) {
+            if (areFilesPublic())
+                f = new File(_context.getAppDir(), dir);
+            else
+                f = new SecureDirectory(_context.getAppDir(), dir);
+        }
        return f; 
    }

@ -187,8 +268,10 @@ public class SnarkManager implements Snark.CompleteListener {
            _config.setProperty(PROP_DIR, "i2psnark");
        if (!_config.containsKey(PROP_AUTO_START))
            _config.setProperty(PROP_AUTO_START, DEFAULT_AUTO_START);
+        if (!_config.containsKey(PROP_REFRESH_DELAY))
+            _config.setProperty(PROP_REFRESH_DELAY, Integer.toString(DEFAULT_REFRESH_DELAY_SECS));
        if (!_config.containsKey(PROP_STARTUP_DELAY))
-            _config.setProperty(PROP_STARTUP_DELAY, "" + DEFAULT_STARTUP_DELAY);
+            _config.setProperty(PROP_STARTUP_DELAY, Integer.toString(DEFAULT_STARTUP_DELAY));
        if (!_config.containsKey(PROP_THEME))
            _config.setProperty(PROP_THEME, DEFAULT_THEME);
        updateConfig();
@ -258,13 +341,15 @@ public class SnarkManager implements Snark.CompleteListener {
        _util.setMaxUploaders(getInt(PROP_UPLOADERS_TOTAL, Snark.MAX_TOTAL_UPLOADERS));
        _util.setMaxUpBW(getInt(PROP_UPBW_MAX, DEFAULT_MAX_UP_BW));
        _util.setStartupDelay(getInt(PROP_STARTUP_DELAY, DEFAULT_STARTUP_DELAY));
-        String ot = _config.getProperty(I2PSnarkUtil.PROP_OPENTRACKERS);
+        _util.setFilesPublic(areFilesPublic());
+        String ot = _config.getProperty(PROP_OPENTRACKERS);
        if (ot != null)
            _util.setOpenTrackerString(ot);
-        String useOT = _config.getProperty(I2PSnarkUtil.PROP_USE_OPENTRACKERS);
+        String useOT = _config.getProperty(PROP_USE_OPENTRACKERS);
        boolean bOT = useOT == null || Boolean.valueOf(useOT).booleanValue();
        _util.setUseOpenTrackers(bOT);
        getDataDir().mkdirs();
+        initTrackerMap();
    }
    
    private int getInt(String prop, int defaultVal) {
@ -278,7 +363,8 @@ public class SnarkManager implements Snark.CompleteListener {
        return defaultVal;
    }
    
-    public void updateConfig(String dataDir, boolean autoStart, String startDelay, String seedPct, String eepHost, 
+    public void updateConfig(String dataDir, boolean filesPublic, boolean autoStart, String refreshDelay,
+                             String startDelay, String seedPct, String eepHost, 
                             String eepPort, String i2cpHost, String i2cpPort, String i2cpOpts,
                             String upLimit, String upBW, boolean useOpenTrackers, String openTrackers, String theme) {
        boolean changed = false;
@ -333,19 +419,34 @@ public class SnarkManager implements Snark.CompleteListener {
 	                    changed = true;
        	            _config.setProperty(PROP_STARTUP_DELAY, "" + minutes);
                	    addMessage(_("Startup delay changed to {0}", DataHelper.formatDuration2(minutes * 60 * 1000)));
-                	}
-
+                }
 	}
-        // FIXME do this even if == null
-	if (i2cpHost != null) {
+
+	if (refreshDelay != null) {
+	    try {
+                int secs = Integer.parseInt(refreshDelay);
+	        if (secs != getRefreshDelaySeconds()) {
+	            changed = true;
+	            _config.setProperty(PROP_REFRESH_DELAY, refreshDelay);
+                    if (secs >= 0)
+	                addMessage(_("Refresh time changed to {0}", DataHelper.formatDuration2(secs * 1000)));
+	            else
+	                addMessage(_("Refresh disabled"));
+	        }
+	    } catch (NumberFormatException nfe) {}
+	}
+
+	// Start of I2CP stuff.
+	// i2cpHost will generally be null since it is hidden from the form if in router context.
+
            int oldI2CPPort = _util.getI2CPPort();
            String oldI2CPHost = _util.getI2CPHost();
            int port = oldI2CPPort;
            if (i2cpPort != null) {
                try { port = Integer.parseInt(i2cpPort); } catch (NumberFormatException nfe) {}
            }
-            String host = oldI2CPHost;
-            Map opts = new HashMap();
+
+            Map<String, String> opts = new HashMap();
            if (i2cpOpts == null) i2cpOpts = "";
            StringTokenizer tok = new StringTokenizer(i2cpOpts, " \t\n");
            while (tok.hasMoreTokens()) {
@ -354,7 +455,7 @@ public class SnarkManager implements Snark.CompleteListener {
                if (split > 0)
                    opts.put(pair.substring(0, split), pair.substring(split+1));
            }
-            Map oldOpts = new HashMap();
+            Map<String, String> oldOpts = new HashMap();
            String oldI2CPOpts = _config.getProperty(PROP_I2CP_OPTS);
            if (oldI2CPOpts == null) oldI2CPOpts = "";
            tok = new StringTokenizer(oldI2CPOpts, " \t\n");
@ -365,37 +466,39 @@ public class SnarkManager implements Snark.CompleteListener {
                    oldOpts.put(pair.substring(0, split), pair.substring(split+1));
            }
            
-            if ( (i2cpHost.trim().length() > 0) && (port > 0) &&
-                 ((!host.equals(i2cpHost) || 
-                  (port != _util.getI2CPPort()) ||
-                  (!oldOpts.equals(opts)))) ) {
+            boolean reconnect = i2cpHost != null && i2cpHost.trim().length() > 0 && port > 0 &&
+                                (port != _util.getI2CPPort() || !oldI2CPHost.equals(i2cpHost));
+            if (reconnect || !oldOpts.equals(opts)) {
                boolean snarksActive = false;
-                Set names = listTorrentFiles();
-                for (Iterator iter = names.iterator(); iter.hasNext(); ) {
-                    Snark snark = getTorrent((String)iter.next());
-                    if ( (snark != null) && (!snark.isStopped()) ) {
-                        snarksActive = true;
-                        break;
+                if (reconnect) {
+                    for (Snark snark : _snarks.values()) {
+                        if (!snark.isStopped()) {
+                            snarksActive = true;
+                            break;
+                        }
                    }
                }
+                if (_log.shouldLog(Log.DEBUG))
+                    _log.debug("i2cp host [" + i2cpHost + "] i2cp port " + port + " opts [" + opts 
+                               + "] oldOpts [" + oldOpts + "]");
                if (snarksActive) {
                    Properties p = new Properties();
                    p.putAll(opts);
                    _util.setI2CPConfig(i2cpHost, port, p);
                    _util.setMaxUpBW(getInt(PROP_UPBW_MAX, DEFAULT_MAX_UP_BW));
                    addMessage(_("I2CP and tunnel changes will take effect after stopping all torrents"));
-                    if (_log.shouldLog(Log.DEBUG))
-                        _log.debug("i2cp host [" + i2cpHost + "] i2cp port " + port + " opts [" + opts 
-                                   + "] oldOpts [" + oldOpts + "]");
+                } else if (!reconnect) {
+                    // The usual case, the other two are if not in router context
+                    _config.setProperty(PROP_I2CP_OPTS, i2cpOpts.trim());
+                    addMessage(_("I2CP options changed to {0}", i2cpOpts));
+                    _util.setI2CPConfig(oldI2CPHost, oldI2CPPort, opts);
                } else {
                    if (_util.connected()) {
                        _util.disconnect();
                        addMessage(_("Disconnecting old I2CP destination"));
                    }
-                    Properties p = new Properties();
-                    p.putAll(opts);
-                    addMessage(_("I2CP settings changed to {0}", i2cpHost + ":" + port + " (" + i2cpOpts.trim() + ")"));
-                    _util.setI2CPConfig(i2cpHost, port, p);
+                    addMessage(_("I2CP settings changed to {0}", i2cpHost + ':' + port + ' ' + i2cpOpts));
+                    _util.setI2CPConfig(i2cpHost, port, opts);
                    _util.setMaxUpBW(getInt(PROP_UPBW_MAX, DEFAULT_MAX_UP_BW));
                    boolean ok = _util.connect();
                    if (!ok) {
@ -409,22 +512,29 @@ public class SnarkManager implements Snark.CompleteListener {
                        _config.setProperty(PROP_I2CP_HOST, i2cpHost.trim());
                        _config.setProperty(PROP_I2CP_PORT, "" + port);
                        _config.setProperty(PROP_I2CP_OPTS, i2cpOpts.trim());
-                        changed = true;
                        // no PeerAcceptors/I2PServerSockets to deal with, since all snarks are inactive
-                        for (Iterator iter = names.iterator(); iter.hasNext(); ) {
-                            String name = (String)iter.next();
-                            Snark snark = getTorrent(name);
-                            if (snark != null && snark.restartAcceptor()) {
+                        for (Snark snark : _snarks.values()) {
+                            if (snark.restartAcceptor()) {
                                addMessage(_("I2CP listener restarted for \"{0}\"", snark.getBaseName()));
                            }
                        }
                    }
                }
                changed = true;
-            }
+            }  // reconnect || changed options
+
+        if (areFilesPublic() != filesPublic) {
+            _config.setProperty(PROP_FILES_PUBLIC, Boolean.toString(filesPublic));
+            _util.setFilesPublic(filesPublic);
+            if (filesPublic)
+                addMessage(_("New files will be publicly readable"));
+            else
+                addMessage(_("New files will not be publicly readable"));
+            changed = true;
        }
+
        if (shouldAutoStart() != autoStart) {
-            _config.setProperty(PROP_AUTO_START, autoStart + "");
+            _config.setProperty(PROP_AUTO_START, Boolean.toString(autoStart));
            if (autoStart)
                addMessage(_("Enabled autostart"));
            else
@ -432,7 +542,7 @@ public class SnarkManager implements Snark.CompleteListener {
            changed = true;
        }
        if (_util.shouldUseOpenTrackers() != useOpenTrackers) {
-            _config.setProperty(I2PSnarkUtil.PROP_USE_OPENTRACKERS, useOpenTrackers + "");
+            _config.setProperty(PROP_USE_OPENTRACKERS, useOpenTrackers + "");
            if (useOpenTrackers)
                addMessage(_("Enabled open trackers - torrent restart required to take effect."));
            else
@ -442,7 +552,7 @@ public class SnarkManager implements Snark.CompleteListener {
        }
        if (openTrackers != null) {
            if (openTrackers.trim().length() > 0 && !openTrackers.trim().equals(_util.getOpenTrackerString())) {
-                _config.setProperty(I2PSnarkUtil.PROP_OPENTRACKERS, openTrackers.trim());
+                _config.setProperty(PROP_OPENTRACKERS, openTrackers.trim());
                _util.setOpenTrackerString(openTrackers);
                addMessage(_("Open Tracker list changed - torrent restart required to take effect."));
                changed = true;
@ -489,7 +599,7 @@ public class SnarkManager implements Snark.CompleteListener {
     * Grab the torrent given the (canonical) filename of the .torrent file
     * @return Snark or null
     */
-    public Snark getTorrent(String filename) { synchronized (_snarks) { return (Snark)_snarks.get(filename); } }
+    public Snark getTorrent(String filename) { synchronized (_snarks) { return _snarks.get(filename); } }

    /**
     * Grab the torrent given the base name of the storage
@ -551,7 +661,7 @@ public class SnarkManager implements Snark.CompleteListener {
        File dataDir = getDataDir();
        Snark torrent = null;
        synchronized (_snarks) {
-            torrent = (Snark)_snarks.get(filename);
+            torrent = _snarks.get(filename);
        }
        // don't hold the _snarks lock while verifying the torrent
        if (torrent == null) {
@ -591,7 +701,9 @@ public class SnarkManager implements Snark.CompleteListener {
                    }

                    if (!TrackerClient.isValidAnnounce(info.getAnnounce())) {
-                        if (_util.shouldUseOpenTrackers() && _util.getOpenTrackers() != null) {
+                        if (info.isPrivate()) {
+                            addMessage(_("ERROR - No I2P trackers in private torrent \"{0}\"", info.getName()));
+                        } else if (_util.shouldUseOpenTrackers() && _util.getOpenTrackers() != null) {
                            //addMessage(_("Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and DHT only.", info.getName()));
                            addMessage(_("Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers only.", info.getName()));
                        //} else if (_util.getDHT() != null) {
@ -723,7 +835,7 @@ public class SnarkManager implements Snark.CompleteListener {
            // so addTorrent won't recheck
            saveTorrentStatus(metainfo, bitfield, null); // no file priorities
            try {
-                locked_writeMetaInfo(metainfo, filename);
+                locked_writeMetaInfo(metainfo, filename, areFilesPublic());
                // hold the lock for a long time
                addTorrent(filename, dontAutoStart);
            } catch (IOException ioe) {
@ -754,7 +866,8 @@ public class SnarkManager implements Snark.CompleteListener {
                _log.error("Failed to write torrent file to " + filename);
                return;
            }
-            SecureFileOutputStream.setPerms(new File(filename));
+            if (!areFilesPublic())
+                SecureFileOutputStream.setPerms(new File(filename));
            // hold the lock for a long time
            addTorrent(filename);
         }
@ -769,13 +882,16 @@ public class SnarkManager implements Snark.CompleteListener {
     *                 Must be a filesystem-safe name.
     * @since 0.8.4
     */
-    private static void locked_writeMetaInfo(MetaInfo metainfo, String filename) throws IOException {
+    private static void locked_writeMetaInfo(MetaInfo metainfo, String filename, boolean areFilesPublic) throws IOException {
        File file = new File(filename);
        if (file.exists())
            throw new IOException("Cannot overwrite an existing .torrent file: " + file.getPath());
        OutputStream out = null;
        try {
-            out = new SecureFileOutputStream(filename);
+            if (areFilesPublic)
+                out = new FileOutputStream(filename);
+            else
+                out = new SecureFileOutputStream(filename);
            out.write(metainfo.getTorrentData());
        } catch (IOException ioe) {
            // remove any partial
@ -783,7 +899,7 @@ public class SnarkManager implements Snark.CompleteListener {
            throw ioe;
        } finally {
            try {
-                if (out == null)
+                if (out != null)
                    out.close();
            } catch (IOException ioe) {}
        }
@ -983,6 +1099,8 @@ public class SnarkManager implements Snark.CompleteListener {
        } else if (info.getPieceLength(0) > Storage.MAX_PIECE_SIZE) {
            return _("Pieces are too large in \"{0}\" ({1}B), deleting it.", info.getName(), DataHelper.formatSize2(info.getPieceLength(0))) + ' ' +
                   _("Limit is {0}B", DataHelper.formatSize2(Storage.MAX_PIECE_SIZE));
+        } else if (info.getTotalLength() <= 0) {
+            return _("Torrent \"{0}\" has no data, deleting it!", info.getName());
        } else if (info.getTotalLength() > Storage.MAX_TOTAL_SIZE) {
            System.out.println("torrent info: " + info.toString());
            List lengths = info.getLengths();
@ -1013,9 +1131,9 @@ public class SnarkManager implements Snark.CompleteListener {
        Snark torrent = null;
        synchronized (_snarks) {
            if (shouldRemove)
-                torrent = (Snark)_snarks.remove(filename);
+                torrent = _snarks.remove(filename);
            else
-                torrent = (Snark)_snarks.get(filename);
+                torrent = _snarks.get(filename);
            remaining = _snarks.size();
        }
        if (torrent != null) {
@ -1087,7 +1205,7 @@ public class SnarkManager implements Snark.CompleteListener {
            // although the user will see the default until then
            getBWLimit();
            boolean doMagnets = true;
-            while (true) {
+            while (_running) {
                File dir = getDataDir();
                if (_log.shouldLog(Log.DEBUG))
                    _log.debug("Directory Monitor loop over " + dir.getAbsolutePath());
@ -1100,8 +1218,12 @@ public class SnarkManager implements Snark.CompleteListener {
                    _log.error("Error in the DirectoryMonitor", e);
                }
                if (doMagnets) {
-                    addMagnets();
-                    doMagnets = false;
+                    try {
+                        addMagnets();
+                        doMagnets = false;
+                    } catch (Exception e) {
+                        _log.error("Error in the DirectoryMonitor", e);
+                    }
                }
                try { Thread.sleep(60*1000); } catch (InterruptedException ie) {}
            }
@ -1157,14 +1279,17 @@ public class SnarkManager implements Snark.CompleteListener {
                return null;
            }
            saveTorrentStatus(meta, storage.getBitField(), null); // no file priorities
-            String name = (new File(getDataDir(), storage.getBaseName() + ".torrent")).getAbsolutePath();
+            // temp for addMessage() in case canonical throws
+            String name = storage.getBaseName();
            try {
+                // _snarks must use canonical
+                name = (new File(getDataDir(), storage.getBaseName() + ".torrent")).getCanonicalPath();
                // put the announce URL in the file
                String announce = snark.getTrackerURL();
                if (announce != null)
                    meta = meta.reannounce(announce);
                synchronized (_snarks) {
-                    locked_writeMetaInfo(meta, name);
+                    locked_writeMetaInfo(meta, name, areFilesPublic());
                    // put it in the list under the new name
                    _snarks.remove(snark.getName());
                    _snarks.put(name, snark);
@ -1182,6 +1307,14 @@ public class SnarkManager implements Snark.CompleteListener {
        return null;
    }

+    /**
+     * A Snark.CompleteListener method.
+     * @since 0.9
+     */
+    public void fatal(Snark snark, String error) {
+        addMessage(_("Error on torrent {0}", snark.getName()) + ": " + error);
+    }
+    
    // End Snark.CompleteListeners

    /**
@ -1220,6 +1353,8 @@ public class SnarkManager implements Snark.CompleteListener {
        }
        
        Set<String> existingNames = listTorrentFiles();
+        if (_log.shouldLog(Log.DEBUG))
+            _log.debug("DirMon found: " + DataHelper.toString(foundNames) + " existing: " + DataHelper.toString(existingNames));
        // lets find new ones first...
        for (int i = 0; i < foundNames.size(); i++) {
            if (existingNames.contains(foundNames.get(i))) {
@ -1272,56 +1407,59 @@ public class SnarkManager implements Snark.CompleteListener {
    }

    /**
-     *  "name", "announceURL=websiteURL" pairs
+     *  Sorted map of name to announceURL=baseURL
+     *  Modifiable, not a copy
     */
-    private static final String DEFAULT_TRACKERS[] = { 
-//       "Postman", "http://YRgrgTLGnbTq2aZOZDJQ~o6Uk5k6TK-OZtx0St9pb0G-5EGYURZioxqYG8AQt~LgyyI~NCj6aYWpPO-150RcEvsfgXLR~CxkkZcVpgt6pns8SRc3Bi-QSAkXpJtloapRGcQfzTtwllokbdC-aMGpeDOjYLd8b5V9Im8wdCHYy7LRFxhEtGb~RL55DA8aYOgEXcTpr6RPPywbV~Qf3q5UK55el6Kex-6VCxreUnPEe4hmTAbqZNR7Fm0hpCiHKGoToRcygafpFqDw5frLXToYiqs9d4liyVB-BcOb0ihORbo0nS3CLmAwZGvdAP8BZ7cIYE3Z9IU9D1G8JCMxWarfKX1pix~6pIA-sp1gKlL1HhYhPMxwyxvuSqx34o3BqU7vdTYwWiLpGM~zU1~j9rHL7x60pVuYaXcFQDR4-QVy26b6Pt6BlAZoFmHhPcAuWfu-SFhjyZYsqzmEmHeYdAwa~HojSbofg0TMUgESRXMw6YThK1KXWeeJVeztGTz25sL8AAAA.i2p/announce.php=http://tracker.postman.i2p/"
-//       , "eBook", "http://E71FRom6PZNEqTN2Lr8P-sr23b7HJVC32KoGnVQjaX6zJiXwhJy2HsXob36Qmj81TYFZdewFZa9mSJ533UZgGyQkXo2ahctg82JKYZfDe5uDxAn1E9YPjxZCWJaFJh0S~UwSs~9AZ7UcauSJIoNtpxrtbmRNVFLqnkEDdLZi26TeucfOmiFmIWnVblLniWv3tG1boE9Abd-6j3FmYVrRucYuepAILYt6katmVNOk6sXmno1Eynrp~~MBuFq0Ko6~jsc2E2CRVYXDhGHEMdt-j6JUz5D7S2RIVzDRqQyAZLKJ7OdQDmI31przzmne1vOqqqLC~1xUumZVIvF~yOeJUGNjJ1Vx0J8i2BQIusn1pQJ6UCB~ZtZZLQtEb8EPVCfpeRi2ri1M5CyOuxN0V5ekmPHrYIBNevuTCRC26NP7ZS5VDgx1~NaC3A-CzJAE6f1QXi0wMI9aywNG5KGzOPifcsih8eyGyytvgLtrZtV7ykzYpPCS-rDfITncpn5hliPUAAAA.i2p/pub/bt/announce.php=http://de-ebook-archiv.i2p/pub/bt/"
-//       , "Gaytorrents", "http://uxPWHbK1OIj9HxquaXuhMiIvi21iK0~ZiG9d8G0840ZXIg0r6CbiV71xlsqmdnU6wm0T2LySriM0doW2gUigo-5BNkUquHwOjLROiETnB3ZR0Ml4IGa6QBPn1aAq2d9~g1r1nVjLE~pcFnXB~cNNS7kIhX1d6nLgYVZf0C2cZopEow2iWVUggGGnAA9mHjE86zLEnTvAyhbAMTqDQJhEuLa0ZYSORqzJDMkQt90MV4YMjX1ICY6RfUSFmxEqu0yWTrkHsTtRw48l~dz9wpIgc0a0T9C~eeWvmBFTqlJPtQZwntpNeH~jF7nlYzB58olgV2HHFYpVYD87DYNzTnmNWxCJ5AfDorm6AIUCV2qaE7tZtI1h6fbmGpGlPyW~Kw5GXrRfJwNvr6ajwAVi~bPVnrBwDZezHkfW4slOO8FACPR28EQvaTu9nwhAbqESxV2hCTq6vQSGjuxHeOuzBOEvRWkLKOHWTC09t2DbJ94FSqETmZopTB1ukEmaxRWbKSIaAAAA.i2p/announce.php=http://gaytorrents.i2p/"
-//       , "NickyB", "http://9On6d3cZ27JjwYCtyJJbowe054d5tFnfMjv4PHsYs-EQn4Y4mk2zRixatvuAyXz2MmRfXG-NAUfhKr0KCxRNZbvHmlckYfT-WBzwwpiMAl0wDFY~Pl8cqXuhfikSG5WrqdPfDNNIBuuznS0dqaczf~OyVaoEOpvuP3qV6wKqbSSLpjOwwAaQPHjlRtNIW8-EtUZp-I0LT45HSoowp~6b7zYmpIyoATvIP~sT0g0MTrczWhbVTUZnEkZeLhOR0Duw1-IRXI2KHPbA24wLO9LdpKKUXed05RTz0QklW5ROgR6TYv7aXFufX8kC0-DaKvQ5JKG~h8lcoHvm1RCzNqVE-2aiZnO2xH08H-iCWoLNJE-Td2kT-Tsc~3QdQcnEUcL5BF-VT~QYRld2--9r0gfGl-yDrJZrlrihHGr5J7ImahelNn9PpkVp6eIyABRmJHf2iicrk3CtjeG1j9OgTSwaNmEpUpn4aN7Kx0zNLdH7z6uTgCGD9Kmh1MFYrsoNlTp4AAAA.i2p/bittorrent/announce.php=http://nickyb.i2p/bittorrent/"
-//       , "Orion", "http://gKik1lMlRmuroXVGTZ~7v4Vez3L3ZSpddrGZBrxVriosCQf7iHu6CIk8t15BKsj~P0JJpxrofeuxtm7SCUAJEr0AIYSYw8XOmp35UfcRPQWyb1LsxUkMT4WqxAT3s1ClIICWlBu5An~q-Mm0VFlrYLIPBWlUFnfPR7jZ9uP5ZMSzTKSMYUWao3ejiykr~mtEmyls6g-ZbgKZawa9II4zjOy-hdxHgP-eXMDseFsrym4Gpxvy~3Fv9TuiSqhpgm~UeTo5YBfxn6~TahKtE~~sdCiSydqmKBhxAQ7uT9lda7xt96SS09OYMsIWxLeQUWhns-C~FjJPp1D~IuTrUpAFcVEGVL-BRMmdWbfOJEcWPZ~CBCQSO~VkuN1ebvIOr9JBerFMZSxZtFl8JwcrjCIBxeKPBmfh~xYh16BJm1BBBmN1fp2DKmZ2jBNkAmnUbjQOqWvUcehrykWk5lZbE7bjJMDFH48v3SXwRuDBiHZmSbsTY6zhGY~GkMQHNGxPMMSIAAAA.i2p/bt/announce.php=http://orion.i2p/bt/"
-//       , "anonymity", "http://8EoJZIKrWgGuDrxA3nRJs1jsPfiGwmFWL91hBrf0HA7oKhEvAna4Ocx47VLUR9retVEYBAyWFK-eZTPcvhnz9XffBEiJQQ~kFSCqb1fV6IfPiV3HySqi9U5Caf6~hC46fRd~vYnxmaBLICT3N160cxBETqH3v2rdxdJpvYt8q4nMk9LUeVXq7zqCTFLLG5ig1uKgNzBGe58iNcsvTEYlnbYcE930ABmrzj8G1qQSgSwJ6wx3tUQNl1z~4wSOUMan~raZQD60lRK70GISjoX0-D0Po9WmPveN3ES3g72TIET3zc3WPdK2~lgmKGIs8GgNLES1cXTolvbPhdZK1gxddRMbJl6Y6IPFyQ9o4-6Rt3Lp-RMRWZ2TG7j2OMcNSiOmATUhKEFBDfv-~SODDyopGBmfeLw16F4NnYednvn4qP10dyMHcUASU6Zag4mfc2-WivrOqeWhD16fVAh8MoDpIIT~0r9XmwdaVFyLcjbXObabJczxCAW3fodQUnvuSkwzAAAA.i2p/anonymityTracker/announce.php=http://anonymityweb.i2p/anonymityTracker/"
-//       , "The freak's tracker", "http://mHKva9x24E5Ygfey2llR1KyQHv5f8hhMpDMwJDg1U-hABpJ2NrQJd6azirdfaR0OKt4jDlmP2o4Qx0H598~AteyD~RJU~xcWYdcOE0dmJ2e9Y8-HY51ie0B1yD9FtIV72ZI-V3TzFDcs6nkdX9b81DwrAwwFzx0EfNvK1GLVWl59Ow85muoRTBA1q8SsZImxdyZ-TApTVlMYIQbdI4iQRwU9OmmtefrCe~ZOf4UBS9-KvNIqUL0XeBSqm0OU1jq-D10Ykg6KfqvuPnBYT1BYHFDQJXW5DdPKwcaQE4MtAdSGmj1epDoaEBUa9btQlFsM2l9Cyn1hzxqNWXELmx8dRlomQLlV4b586dRzW~fLlOPIGC13ntPXogvYvHVyEyptXkv890jC7DZNHyxZd5cyrKC36r9huKvhQAmNABT2Y~pOGwVrb~RpPwT0tBuPZ3lHYhBFYmD8y~AOhhNHKMLzea1rfwTvovBMByDdFps54gMN1mX4MbCGT4w70vIopS9yAAAA.i2p/bytemonsoon/announce.php"
-//       , "mastertracker", "http://VzXD~stRKbL3MOmeTn1iaCQ0CFyTmuFHiKYyo0Rd~dFPZFCYH-22rT8JD7i-C2xzYFa4jT5U2aqHzHI-Jre4HL3Ri5hFtZrLk2ax3ji7Qfb6qPnuYkuiF2E2UDmKUOppI8d9Ye7tjdhQVCy0izn55tBaB-U7UWdcvSK2i85sauyw3G0Gfads1Rvy5-CAe2paqyYATcDmGjpUNLoxbfv9KH1KmwRTNH6k1v4PyWYYnhbT39WfKMbBjSxVQRdi19cyJrULSWhjxaQfJHeWx5Z8Ev4bSPByBeQBFl2~4vqy0S5RypINsRSa3MZdbiAAyn5tr5slWR6QdoqY3qBQgBJFZppy-3iWkFqqKgSxCPundF8gdDLC5ddizl~KYcYKl42y9SGFHIukH-TZs8~em0~iahzsqWVRks3zRG~tlBcX2U3M2~OJs~C33-NKhyfZT7-XFBREvb8Szmd~p66jDxrwOnKaku-G6DyoQipJqIz4VHmY9-y5T8RrUcJcM-5lVoMpAAAA.i2p/announce.php=http://tracker.mastertracker.i2p/"
-//       , "Galen", "http://5jpwQMI5FT303YwKa5Rd38PYSX04pbIKgTaKQsWbqoWjIfoancFdWCShXHLI5G5ofOb0Xu11vl2VEMyPsg1jUFYSVnu4-VfMe3y4TKTR6DTpetWrnmEK6m2UXh91J5DZJAKlgmO7UdsFlBkQfR2rY853-DfbJtQIFl91tbsmjcA5CGQi4VxMFyIkBzv-pCsuLQiZqOwWasTlnzey8GcDAPG1LDcvfflGV~6F5no9mnuisZPteZKlrv~~TDoXTj74QjByWc4EOYlwqK8sbU9aOvz~s31XzErbPTfwiawiaZ0RUI-IDrKgyvmj0neuFTWgjRGVTH8bz7cBZIc3viy6ioD-eMQOrXaQL0TCWZUelRwHRvgdPiQrxdYQs7ixkajeHzxi-Pq0EMm5Vbh3j3Q9kfUFW3JjFDA-MLB4g6XnjCbM5J1rC0oOBDCIEfhQkszru5cyLjHiZ5yeA0VThgu~c7xKHybv~OMXION7V8pBKOgET7ZgAkw1xgYe3Kkyq5syAAAA.i2p/tr/announce.php=http://galen.i2p/tr/"
-       "Postman", "http://tracker2.postman.i2p/announce.php=http://tracker2.postman.i2p/"
-       ,"Welterde", "http://tracker.welterde.i2p/a=http://tracker.welterde.i2p/stats?mode=top5"
-//       , "CRSTRACK", "http://b4G9sCdtfvccMAXh~SaZrPqVQNyGQbhbYMbw6supq2XGzbjU4NcOmjFI0vxQ8w1L05twmkOvg5QERcX6Mi8NQrWnR0stLExu2LucUXg1aYjnggxIR8TIOGygZVIMV3STKH4UQXD--wz0BUrqaLxPhrm2Eh9Hwc8TdB6Na4ShQUq5Xm8D4elzNUVdpM~RtChEyJWuQvoGAHY3ppX-EJJLkiSr1t77neS4Lc-KofMVmgI9a2tSSpNAagBiNI6Ak9L1T0F9uxeDfEG9bBSQPNMOSUbAoEcNxtt7xOW~cNOAyMyGydwPMnrQ5kIYPY8Pd3XudEko970vE0D6gO19yoBMJpKx6Dh50DGgybLQ9CpRaynh2zPULTHxm8rneOGRcQo8D3mE7FQ92m54~SvfjXjD2TwAVGI~ae~n9HDxt8uxOecAAvjjJ3TD4XM63Q9TmB38RmGNzNLDBQMEmJFpqQU8YeuhnS54IVdUoVQFqui5SfDeLXlSkh4vYoMU66pvBfWbAAAA.i2p/tracker/announce.php=http://crstrack.i2p/tracker/"
-       ,"Exotrack", "http://blbgywsjubw3d2zih2giokakhe3o2cko7jtte4risb3hohbcoyva.b32.i2p/announce.php=http://exotrack.i2p/"
-    };
-    
-    /** comma delimited list of name=announceURL=baseURL for the trackers to be displayed */
-    public static final String PROP_TRACKERS = "i2psnark.trackers";
-    private static Map<String, String> trackerMap = null;
-    /** sorted map of name to announceURL=baseURL */
    public Map<String, String> getTrackers() { 
-        if (trackerMap != null) // only do this once, can't be updated while running
-            return trackerMap;
-        Map<String, String> rv = new TreeMap();
+        return _trackerMap;
+    }
+
+    /** @since 0.9 */
+    private void initTrackerMap() {
        String trackers = _config.getProperty(PROP_TRACKERS);
        if ( (trackers == null) || (trackers.trim().length() <= 0) )
            trackers = _context.getProperty(PROP_TRACKERS);
+        _trackerMap.clear();
        if ( (trackers == null) || (trackers.trim().length() <= 0) ) {
            for (int i = 0; i < DEFAULT_TRACKERS.length; i += 2)
-                rv.put(DEFAULT_TRACKERS[i], DEFAULT_TRACKERS[i+1]);
+                _trackerMap.put(DEFAULT_TRACKERS[i], DEFAULT_TRACKERS[i+1]);
        } else {
-            StringTokenizer tok = new StringTokenizer(trackers, ",");
-            while (tok.hasMoreTokens()) {
-                String pair = tok.nextToken();
-                int split = pair.indexOf('=');
-                if (split <= 0)
-                    continue;
-                String name = pair.substring(0, split).trim();
-                String url = pair.substring(split+1).trim();
+            String[] toks = trackers.split(",");
+            for (int i = 0; i < toks.length; i += 2) {
+                String name = toks[i].trim().replace("&#44;", ",");
+                String url = toks[i+1].trim().replace("&#44;", ",");
                if ( (name.length() > 0) && (url.length() > 0) )
-                    rv.put(name, url);
+                    _trackerMap.put(name, url);
            }
        }
-        
-        trackerMap = rv;
-        return trackerMap;
    }
-    
+
+    /** @since 0.9 */
+    public void setDefaultTrackerMap() {
+        _trackerMap.clear();
+        for (int i = 0; i < DEFAULT_TRACKERS.length; i += 2) {
+            _trackerMap.put(DEFAULT_TRACKERS[i], DEFAULT_TRACKERS[i+1]);
+        }
+        if (_config.remove(PROP_TRACKERS) != null) {
+            saveConfig();
+        }
+    }
+
+    /** @since 0.9 */
+    public void saveTrackerMap() {
+        StringBuilder buf = new StringBuilder(2048);
+        boolean comma = false;
+        for (Map.Entry<String, String> e : _trackerMap.entrySet()) {
+            if (comma)
+                buf.append(',');
+            else
+                comma = true;
+            buf.append(e.getKey().replace(",", "&#44;")).append(',').append(e.getValue().replace(",", "&#44;"));
+        }
+        _config.setProperty(PROP_TRACKERS, buf.toString());
+        saveConfig();
+    }
+
    private static class TorrentFilenameFilter implements FilenameFilter {
        private static final TorrentFilenameFilter _filter = new TorrentFilenameFilter();
        public static TorrentFilenameFilter instance() { return _filter; }
@ -1341,4 +1479,14 @@ public class SnarkManager implements Snark.CompleteListener {
            }
        }
    }
+
+    /**
+     *  ignore case, current locale
+     *  @since 0.9
+     */
+    private static class IgnoreCaseComparator implements Comparator<String> {
+        public int compare(String l, String r) {
+            return l.toLowerCase().compareTo(r.toLowerCase());
+        }
+    }
 }
--- a/apps/i2psnark/java/src/org/klomp/snark/Storage.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Storage.java
@ -23,10 +23,15 @@ package org.klomp.snark;
 import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetEncoder;
+import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.StringTokenizer;
+import java.util.concurrent.ConcurrentHashMap;

 import net.i2p.crypto.SHA1;
 import net.i2p.util.SecureFile;
@ -47,7 +52,7 @@ public class Storage
  private int[] priorities;

  private final StorageListener listener;
-  private I2PSnarkUtil _util;
+  private final I2PSnarkUtil _util;

  private /* FIXME final FIXME */ BitField bitfield; // BitField to represent the pieces
  private int needed; // Number of pieces needed
@ -66,6 +71,8 @@ public class Storage
  public static final int MAX_PIECES = 10*1024;
  public static final long MAX_TOTAL_SIZE = MAX_PIECE_SIZE * (long) MAX_PIECES;

+  private static final Map<String, String> _filterNameCache = new ConcurrentHashMap();
+
  /**
   * Creates a new storage based on the supplied MetaInfo.  This will
   * try to create and/or check all needed files in the MetaInfo.
@ -94,7 +101,8 @@ public class Storage
   * @param announce may be null
   * @param listener may be null
   */
-  public Storage(I2PSnarkUtil util, File baseFile, String announce, StorageListener listener)
+  public Storage(I2PSnarkUtil util, File baseFile, String announce,
+                 boolean privateTorrent, StorageListener listener)
    throws IOException
  {
    _util = util;
@ -150,7 +158,7 @@ public class Storage

    byte[] piece_hashes = fast_digestCreate();
    metainfo = new MetaInfo(announce, baseFile.getName(), null, files,
-                            lengthsList, piece_size, piece_hashes, total);
+                            lengthsList, piece_size, piece_hashes, total, privateTorrent);

  }

@ -165,7 +173,7 @@ public class Storage
   */
  private byte[] fast_digestCreate() throws IOException {
    // Calculate piece_hashes
-    SHA1 digest = new SHA1();
+    MessageDigest digest = SHA1.getInstance();

    byte[] piece_hashes = new byte[20 * pieces];

@ -432,7 +440,12 @@ public class Storage
  /** use a saved bitfield and timestamp from a config file */
  public void check(String rootDir, long savedTime, BitField savedBitField) throws IOException
  {
-    File base = new SecureFile(rootDir, filterName(metainfo.getName()));
+    File base;
+    boolean areFilesPublic = _util.getFilesPublic();
+    if (areFilesPublic)
+        base = new File(rootDir, filterName(metainfo.getName()));
+    else
+        base = new SecureFile(rootDir, filterName(metainfo.getName()));
    boolean useSavedBitField = savedTime > 0 && savedBitField != null;

    List<List<String>> files = metainfo.getFiles();
@ -478,7 +491,7 @@ public class Storage
        for (int i = 0; i < size; i++)
          {
            List<String> path = files.get(i);
-            File f = createFileFromNames(base, path);
+            File f = createFileFromNames(base, path, areFilesPublic);
            // dup file name check after filtering
            for (int j = 0; j < i; j++) {
                if (f.equals(RAFfile[j])) {
@ -494,7 +507,7 @@ public class Storage
                    else
                        lastPath = '_' + lastPath;
                    path.set(last, lastPath);
-                    f = createFileFromNames(base, path);
+                    f = createFileFromNames(base, path, areFilesPublic);
                    j = 0;
                }
            }
@ -556,25 +569,62 @@ public class Storage
  private static final char[] ILLEGAL = new char[] {
        '<', '>', ':', '"', '/', '\\', '|', '?', '*',
        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-        16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 };
+        16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+        0x7f,
+        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+        0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+        0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
+        0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
+        // unicode newlines
+        0x2028, 0x2029
+     };

  /**
   * Removes 'suspicious' characters from the given file name.
   * http://msdn.microsoft.com/en-us/library/aa365247%28VS.85%29.aspx
+   * Then replace chars not supported in the charset.
+   *
+   * This is called frequently and it can be pretty slow so cache the result.
+   *
+   * TODO: If multiple files in the same torrent map to the same filter name,
+   * the whole torrent will blow up. Check at torrent creation?
   */
  public static String filterName(String name)
  {
-    if (name.equals(".") || name.equals(" "))
-        return "_";
-    String rv = name;
-    if (rv.startsWith("."))
-        rv = '_' + rv.substring(1);
-    if (rv.endsWith(".") || rv.endsWith(" "))
-        rv = rv.substring(0, rv.length() - 1) + '_';
-    for (int i = 0; i < ILLEGAL.length; i++) {
-        if (rv.indexOf(ILLEGAL[i]) >= 0)
-            rv = rv.replace(ILLEGAL[i], '_');
+    String rv = _filterNameCache.get(name);
+    if (rv != null)
+        return rv;
+    if (name.equals(".") || name.equals(" ")) {
+        rv = "_";
+    } else {
+        rv = name;
+        if (rv.startsWith("."))
+            rv = '_' + rv.substring(1);
+        if (rv.endsWith(".") || rv.endsWith(" "))
+            rv = rv.substring(0, rv.length() - 1) + '_';
+        for (int i = 0; i < ILLEGAL.length; i++) {
+            if (rv.indexOf(ILLEGAL[i]) >= 0)
+                rv = rv.replace(ILLEGAL[i], '_');
+        }
+        // Replace characters not supported in the charset
+        if (!Charset.defaultCharset().name().equals("UTF-8")) {
+            try {
+                CharsetEncoder enc = Charset.defaultCharset().newEncoder();
+                if (!enc.canEncode(rv)) {
+                    String repl = rv;
+                    for (int i = 0; i < rv.length(); i++) {
+                        char c = rv.charAt(i);
+                        if (!enc.canEncode(c))
+                            repl = repl.replace(c, '_');
+                    }
+                    rv = repl;
+                }
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+        }
    }
+    _filterNameCache.put(name, rv);
    return rv;
  }

@ -583,7 +633,7 @@ public class Storage
   *  things going in the wrong place if there are duplicates
   *  in intermediate path elements after filtering.
   */
-  private static File createFileFromNames(File base, List<String> names) throws IOException
+  private static File createFileFromNames(File base, List<String> names, boolean areFilesPublic) throws IOException
  {
    File f = null;
    Iterator<String> it = names.iterator();
@ -593,7 +643,10 @@ public class Storage
        if (it.hasNext())
          {
            // Another dir in the hierarchy.
-            f = new File(base, name);
+            if (areFilesPublic)
+                f = new File(base, name);
+            else
+                f = new SecureFile(base, name);
            if (!f.mkdir() && !f.isDirectory())
              throw new IOException("Could not create directory " + f);
            base = f;
@ -601,7 +654,10 @@ public class Storage
        else
          {
            // The final element (file) in the hierarchy.
-            f = new SecureFile(base, name);
+            if (areFilesPublic)
+                f = new File(base, name);
+            else
+                f = new SecureFile(base, name);
            if (!f.createNewFile() && !f.exists())
              throw new IOException("Could not create file " + f);
          }
@ -749,27 +805,19 @@ public class Storage
    openRAF(nr, false);  // RW
    // XXX - Is this the best way to make sure we have enough space for
    // the whole file?
+    long remaining = lengths[nr];
    if (listener != null)
-        listener.storageCreateFile(this, names[nr], lengths[nr]);
-    final int ZEROBLOCKSIZE = piece_size;
-    byte[] zeros;
-    try {
-        zeros = new byte[ZEROBLOCKSIZE];
-    } catch (OutOfMemoryError oom) {
-        throw new IOException(oom.toString());
+        listener.storageCreateFile(this, names[nr], remaining);
+    final int ZEROBLOCKSIZE = (int) Math.min(remaining, 32*1024);
+    byte[] zeros = new byte[ZEROBLOCKSIZE];
+    while (remaining > 0) {
+        int size = (int) Math.min(remaining, ZEROBLOCKSIZE);
+        rafs[nr].write(zeros, 0, size);
+        remaining -= size;
    }
-    int i;
-    for (i = 0; i < lengths[nr]/ZEROBLOCKSIZE; i++)
-      {
-        rafs[nr].write(zeros);
-        if (listener != null)
-          listener.storageAllocated(this, ZEROBLOCKSIZE);
-      }
-    int size = (int)(lengths[nr] - i*ZEROBLOCKSIZE);
-    rafs[nr].write(zeros, 0, size);
    // caller will close rafs[nr]
    if (listener != null)
-      listener.storageAllocated(this, size);
+      listener.storageAllocated(this, lengths[nr]);
  }


@ -829,7 +877,7 @@ public class Storage
  {
    // First check if the piece is correct.
    // Copy the array first to be paranoid.
-    byte[] bs = (byte[]) ba.clone();
+    byte[] bs = ba.clone();
    int length = bs.length;
    boolean correctHash = metainfo.checkPiece(piece, bs, 0, length);
    if (listener != null)
--- a/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java
@ -30,6 +30,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Random;
 import java.util.Set;

@ -38,8 +39,6 @@ import net.i2p.data.Hash;
 import net.i2p.util.I2PAppThread;
 import net.i2p.util.Log;

-import org.klomp.snark.dht.DHT;
-
 /**
 * Informs metainfo tracker of events and gets new peers for peer
 * coordinator.
@ -155,7 +154,7 @@ public class TrackerClient extends I2PAppThread
        primary = "";
    }
    List tlist = _util.getOpenTrackers();
-    if (tlist != null) {
+    if (tlist != null && (meta == null || !meta.isPrivate())) {
        for (int i = 0; i < tlist.size(); i++) {
             String url = (String)tlist.get(i);
             if (!isValidAnnounce(url)) {
@ -199,8 +198,6 @@ public class TrackerClient extends I2PAppThread
    long left = coordinator.getLeft();

    boolean completed = (left == 0);
-    int sleptTime = 0;
-
    try
      {
        if (!verifyConnected()) return;
@ -259,8 +256,6 @@ public class TrackerClient extends I2PAppThread
              event = NO_EVENT;
            
            // *** loop once for each tracker
-            // Only do a request when necessary.
-            sleptTime = 0;
            int maxSeenPeers = 0;
            for (Iterator iter = trackers.iterator(); iter.hasNext(); ) {
              Tracker tr = (Tracker)iter.next();
@ -309,7 +304,6 @@ public class TrackerClient extends I2PAppThread
                          // only delay if we actually make an attempt to add peer
                          if(coordinator.addPeer(cur) && it.hasNext()) {
                            int delay = (DELAY_MUL * r.nextInt(10)) + DELAY_MIN;
-                            sleptTime += delay;
                            try { Thread.sleep(delay); } catch (InterruptedException ie) {}
                          }
                        }
@ -325,7 +319,7 @@ public class TrackerClient extends I2PAppThread
                    // don't show secondary tracker problems to the user
                    if (tr.isPrimary)
                      snark.setTrackerProblems(tr.trackerProblems);
-                    if (tr.trackerProblems.toLowerCase().startsWith(NOT_REGISTERED)) {
+                    if (tr.trackerProblems.toLowerCase(Locale.US).startsWith(NOT_REGISTERED)) {
                      // Give a guy some time to register it if using opentrackers too
                      if (trackers.size() == 1) {
                        stop = true;
@ -347,7 +341,7 @@ public class TrackerClient extends I2PAppThread
            }  // *** end of trackers loop here

            // Get peers from PEX
-            if (left > 0 && coordinator.needPeers() && !stop) {
+            if (left > 0 && coordinator.needPeers() && (meta == null || !meta.isPrivate()) && !stop) {
                Set<PeerID> pids = coordinator.getPEXPeers();
                if (!pids.isEmpty()) {
                    _util.debug("Got " + pids.size() + " from PEX", Snark.INFO);
@ -369,7 +363,7 @@ public class TrackerClient extends I2PAppThread

            // Get peers from DHT
            // FIXME this needs to be in its own thread
-            if (_util.getDHT() != null && !stop) {
+            if (_util.getDHT() != null && (meta == null || !meta.isPrivate()) && !stop) {
                int numwant;
                if (left == 0 || event.equals(STOPPED_EVENT) || !coordinator.needPeers())
                    numwant = 1;
@ -443,22 +437,33 @@ public class TrackerClient extends I2PAppThread
                                long downloaded, long left, String event)
    throws IOException
  {
-    // What do we send for left in magnet mode? Can we omit it?
-    long tleft = left >= 0 ? left : 1;
-    String s = tr.announce
-      + "?info_hash=" + infoHash
-      + "&peer_id=" + peerID
-      + "&port=" + port
-      + "&ip=" + _util.getOurIPString() + ".i2p"
-      + "&uploaded=" + uploaded
-      + "&downloaded=" + downloaded
-      + "&left=" + tleft
-      + "&compact=1"   // NOTE: opentracker will return 400 for &compact alone
-      + ((! event.equals(NO_EVENT)) ? ("&event=" + event) : "");
-    if (left == 0 || event.equals(STOPPED_EVENT) || !coordinator.needPeers())
-        s += "&numwant=0";
+    StringBuilder buf = new StringBuilder(512);
+    buf.append(tr.announce);
+    if (tr.announce.contains("?"))
+        buf.append('&');
    else
-        s += "&numwant=" + _util.getMaxConnections();
+        buf.append('?');
+    buf.append("info_hash=").append(infoHash)
+       .append("&peer_id=").append(peerID)
+       .append("&port=").append(port)
+       .append("&ip=" ).append(_util.getOurIPString()).append(".i2p")
+       .append("&uploaded=").append(uploaded)
+       .append("&downloaded=").append(downloaded)
+       .append("&left=");
+    // What do we send for left in magnet mode? Can we omit it?
+    if (left >= 0)
+        buf.append(left);
+    else
+        buf.append('1');
+    buf.append("&compact=1");  // NOTE: opentracker will return 400 for &compact alone
+    if (! event.equals(NO_EVENT))
+        buf.append("&event=").append(event);
+    buf.append("&numwant=");
+    if (left == 0 || event.equals(STOPPED_EVENT) || !coordinator.needPeers())
+        buf.append('0');
+    else
+        buf.append(_util.getMaxConnections());
+    String s = buf.toString();
    _util.debug("Sending TrackerClient request: " + s, Snark.INFO);
      
    tr.lastRequestTime = System.currentTimeMillis();
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@ -2,7 +2,6 @@ package org.klomp.snark.web;

 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.text.Collator;
@ -14,15 +13,14 @@ import java.util.Comparator;
 import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;

 import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

@ -30,10 +28,8 @@ import net.i2p.I2PAppContext;
 import net.i2p.data.Base32;
 import net.i2p.data.Base64;
 import net.i2p.data.DataHelper;
-import net.i2p.util.FileUtil;
 import net.i2p.util.I2PAppThread;
 import net.i2p.util.Log;
-import net.i2p.util.SecureFileOutputStream;

 import org.klomp.snark.I2PSnarkUtil;
 import org.klomp.snark.MetaInfo;
@ -43,17 +39,16 @@ import org.klomp.snark.SnarkManager;
 import org.klomp.snark.Storage;
 import org.klomp.snark.TrackerClient;

-import org.mortbay.http.HttpResponse;
-import org.mortbay.jetty.servlet.Default;
-import org.mortbay.util.Resource;
-import org.mortbay.util.URI;
+import org.mortbay.jetty.servlet.DefaultServlet;
+import org.mortbay.resource.Resource;
+import org.mortbay.util.URIUtil;

 /**
 *  We extend Default instead of HTTPServlet so we can handle
 *  i2psnark/ file requests with http:// instead of the flaky and
 *  often-blocked-by-the-browser file://
 */
-public class I2PSnarkServlet extends Default {
+public class I2PSnarkServlet extends DefaultServlet {
    private I2PAppContext _context;
    private Log _log;
    private SnarkManager _manager;
@ -99,13 +94,17 @@ public class I2PSnarkServlet extends Default {
     *  and we can't get any resources (like icons) out of the .war
     */
    @Override
-    protected Resource getResource(String pathInContext) throws IOException
+    public Resource getResource(String pathInContext)
    {
        if (pathInContext == null || pathInContext.equals("/") || pathInContext.equals("/index.jsp") ||
-            pathInContext.equals("/index.html") || pathInContext.startsWith("/_icons/"))
+            pathInContext.equals("/index.html") || pathInContext.startsWith("/.icons/"))
            return super.getResource(pathInContext);
        // files in the i2psnark/ directory
-        return _resourceBase.addPath(pathInContext);
+        try {
+            return _resourceBase.addPath(pathInContext);
+        } catch (IOException ioe) {
+            throw new RuntimeException(ioe);
+        }
    }

    /**
@ -113,10 +112,8 @@ public class I2PSnarkServlet extends Default {
     *  @since 0.8.3
     */
    @Override
-    public void handleGet(HttpServletRequest request, HttpServletResponse response, String pathInContext, Resource resource, boolean endsWithSlash) throws ServletException, IOException {
-        if (resource.getName().startsWith("jar:file:"))
-            response.setHeader("Cache-Control", "max-age=86400");  // cache for a day
-        super.handleGet(request, response, pathInContext, resource, endsWithSlash);
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        super.doGet(request, response);
    }

    /**
@ -144,33 +141,46 @@ public class I2PSnarkServlet extends Default {
        // since we are not overriding handle*(), do this here
        String method = req.getMethod();
        if (!(method.equals("GET") || method.equals("HEAD") || method.equals("POST"))) {
-            resp.sendError(HttpResponse.__405_Method_Not_Allowed);
+            resp.sendError(405);
            return;
        }
        _themePath = "/themes/snark/" + _manager.getTheme() + '/';
        _imgPath = _themePath + "images/";
        // this is the part after /i2psnark
        String path = req.getServletPath();
+
+        // AJAX for mainsection
+        if ("/.ajax/xhr1.html".equals(path)) {
+            resp.setCharacterEncoding("UTF-8");
+            resp.setContentType("text/html; charset=UTF-8");
+            PrintWriter out = resp.getWriter();
+            //if (_log.shouldLog(Log.DEBUG))
+            //    _manager.addMessage((_context.clock().now() / 1000) + " xhr1 p=" + req.getParameter("p"));
+            writeMessages(out, false);
+            writeTorrents(out, req);
+            return;
+        }
+
        boolean isConfigure = "/configure".equals(path);
        // index.jsp doesn't work, it is grabbed by the war handler before here
        if (!(path == null || path.equals("/") || path.equals("/index.jsp") || path.equals("/index.html") || path.equals("/_post") || isConfigure)) {
            if (path.endsWith("/")) {
                // bypass the horrid Resource.getListHTML()
                String pathInfo = req.getPathInfo();
-                String pathInContext = URI.addPaths(path, pathInfo);
+                String pathInContext = URIUtil.addPaths(path, pathInfo);
                req.setCharacterEncoding("UTF-8");
                resp.setCharacterEncoding("UTF-8");
                resp.setContentType("text/html; charset=UTF-8");
                Resource resource = getResource(pathInContext);
                if (resource == null || (!resource.exists())) {
-                    resp.sendError(HttpResponse.__404_Not_Found);
+                    resp.sendError(404);
                } else {
-                    String base = URI.addPaths(req.getRequestURI(), "/");
+                    String base = URIUtil.addPaths(req.getRequestURI(), "/");
                    String listing = getListHTML(resource, base, true, method.equals("POST") ? req.getParameterMap() : null);
                    if (listing != null)
                        resp.getWriter().write(listing);
                    else // shouldn't happen
-                        resp.sendError(HttpResponse.__404_Not_Found);
+                        resp.sendError(404);
                }
            } else {
                super.service(req, resp);
@ -192,7 +202,8 @@ public class I2PSnarkServlet extends Default {
        
        String peerParam = req.getParameter("p");
        String peerString;
-        if (peerParam == null || !_manager.util().connected()) {
+        if (peerParam == null || (!_manager.util().connected()) ||
+            peerParam.replaceAll("[a-zA-Z0-9~=-]", "").length() > 0) {  // XSS
            peerString = "";
        } else {
            peerString = "?p=" + peerParam;
@ -208,10 +219,24 @@ public class I2PSnarkServlet extends Default {
        out.write("</title>\n");
                                         
        // we want it to go to the base URI so we don't refresh with some funky action= value
-        if (!isConfigure)
-            out.write("<meta http-equiv=\"refresh\" content=\"60;/i2psnark/" + peerString + "\">\n");
-        out.write(HEADER_A + _themePath + HEADER_B);
-        out.write("</head><body>");
+        int delay = 0;
+        if (!isConfigure) {
+            delay = _manager.getRefreshDelaySeconds();
+            if (delay > 0) {
+                //out.write("<meta http-equiv=\"refresh\" content=\"" + delay + ";/i2psnark/" + peerString + "\">\n");
+                out.write("<script src=\"/js/ajax.js\" type=\"text/javascript\"></script>\n" +
+                          "<script type=\"text/javascript\">\n"  +
+                          "var failMessage = \"<b>" + _("Router is down") + "<\\/b>\";\n" +
+                          "function requestAjax1() { ajax(\"/i2psnark/.ajax/xhr1.html" + peerString + "\", \"mainsection\", " + (delay*1000) + "); }\n" +
+                          "function initAjax(delayMs) { setTimeout(requestAjax1, " + (delay*1000) +");  }\n"  +
+                          "</script>\n");
+            }
+        }
+        out.write(HEADER_A + _themePath + HEADER_B + "</head>\n");
+        if (isConfigure || delay <= 0)
+            out.write("<body>");
+        else
+            out.write("<body onload=\"initAjax()\">");
        out.write("<center>");
        if (isConfigure) {
            out.write("<div class=\"snarknavbar\"><a href=\"/i2psnark/\" title=\"");
@ -243,34 +268,53 @@ public class I2PSnarkServlet extends Default {
            }
        }
        out.write("</div>\n");
-        out.write("<div class=\"page\"><div class=\"mainsection\"><div class=\"snarkMessages\"><table><tr><td align=\"left\"><pre>");
-        List msgs = _manager.getMessages();
-        for (int i = msgs.size()-1; i >= 0; i--) {
-            String msg = (String)msgs.get(i);
-            out.write(msg + "\n");
-        }
-        out.write("</pre></td></tr></table></div>");
+        String newURL = req.getParameter("newURL");
+        if (newURL != null && newURL.trim().length() > 0 && req.getMethod().equals("GET"))
+            _manager.addMessage(_("Click \"Add torrent\" button to fetch torrent"));
+        out.write("<div class=\"page\"><div id=\"mainsection\" class=\"mainsection\">");
+
+        writeMessages(out, isConfigure);

        if (isConfigure) {
+            // end of mainsection div
            out.write("<div class=\"logshim\"></div></div>\n");
            writeConfigForm(out, req);
+            writeTrackerForm(out, req);
        } else {
            writeTorrents(out, req);
-            out.write("</div>\n");
+            // end of mainsection div
+            out.write("</div><div id=\"lowersection\">\n");
            writeAddForm(out, req);
            writeSeedForm(out, req);
            writeConfigLink(out);
+            // end of lowersection div
+            out.write("</div>\n");
        }
        out.write(FOOTER);
    }

+    private void writeMessages(PrintWriter out, boolean isConfigure) throws IOException {
+        List<String> msgs = _manager.getMessages();
+        if (!msgs.isEmpty()) {
+            out.write("<div class=\"snarkMessages\"><ul>");
+            for (int i = msgs.size()-1; i >= 0; i--) {
+                String msg = msgs.get(i);
+                out.write("<li>" + msg + "</li>\n");
+            }
+            // lazy GET, lose p parameter
+            out.write("</ul><p><a href=\"/i2psnark/");
+            if (isConfigure)
+                out.write("configure");
+            out.write("?action=Clear&amp;nonce=" + _nonce + "\">" + _("clear messages") + "</a></p></div>");
+        }
+    }
+
    private void writeTorrents(PrintWriter out, HttpServletRequest req) throws IOException {
        /** dl, ul, down rate, up rate, peers, size */
        final long stats[] = {0,0,0,0,0,0};
        String peerParam = req.getParameter("p");

        List snarks = getSortedSnarks(req);
-        String uri = req.getRequestURI();
        boolean isForm = _manager.util().connected() || !snarks.isEmpty();
        if (isForm) {
            out.write("<form action=\"_post\" method=\"POST\">\n");
@ -384,6 +428,7 @@ public class I2PSnarkServlet extends Default {
            out.write("&nbsp;");
        }
        out.write("</th></tr></thead>\n");
+        String uri = "/i2psnark/";
        for (int i = 0; i < snarks.size(); i++) {
            Snark snark = (Snark)snarks.get(i);
            boolean showDebug = "2".equals(peerParam);
@ -450,7 +495,6 @@ public class I2PSnarkServlet extends Default {
        //    return;
        //}
        if ("Add".equals(action)) {
-            String newFile = req.getParameter("newFile");
            String newURL = req.getParameter("newURL");
         /******
            // NOTE - newFile currently disabled in HTML form - see below
@ -488,11 +532,15 @@ public class I2PSnarkServlet extends Default {
          *****/
            if (newURL != null) {
                if (newURL.startsWith("http://")) {
+                    if (!_manager.util().connected())
+                        _manager.addMessage(_("Opening the I2P tunnel"));
                    _manager.addMessage(_("Fetching {0}", urlify(newURL)));
                    I2PAppThread fetch = new I2PAppThread(new FetchAndAdd(_manager, newURL), "Fetch and add", true);
                    fetch.start();
                } else if (newURL.startsWith(MAGNET) || newURL.startsWith(MAGGOT)) {
                    addMagnet(newURL);
+                } else if (newURL.length() == 40 && newURL.replaceAll("[a-fA-F0-9]", "").length() == 0) {
+                    addMagnet(MAGNET_FULL + newURL);
                } else {
                    _manager.addMessage(_("Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\"", MAGNET, MAGGOT));
                }
@ -576,7 +624,7 @@ public class I2PSnarkServlet extends Default {
                            File f = new File(name);
                            f.delete();
                            _manager.addMessage(_("Torrent file deleted: {0}", f.getAbsolutePath()));
-                            List files = meta.getFiles();
+                            List<List<String>> files = meta.getFiles();
                            String dataFile = snark.getBaseName();
                            f = new File(_manager.getDataDir(), dataFile);
                            if (files == null) { // single file torrent
@ -586,23 +634,36 @@ public class I2PSnarkServlet extends Default {
                                    _manager.addMessage(_("Data file could not be deleted: {0}", f.getAbsolutePath()));
                                break;
                            }
-                            for (int i = 0; i < files.size(); i++) { // pass 1 delete files
+                            // step 1 delete files
+                            for (int i = 0; i < files.size(); i++) {
                                // multifile torrents have the getFiles() return lists of lists of filenames, but
                                // each of those lists just contain a single file afaict...
-                                File df = Storage.getFileFromNames(f, (List) files.get(i));
+                                File df = Storage.getFileFromNames(f, files.get(i));
                                if (df.delete())
                                    _manager.addMessage(_("Data file deleted: {0}", df.getAbsolutePath()));
                                else
                                    _manager.addMessage(_("Data file could not be deleted: {0}", df.getAbsolutePath()));
                            }
-                            for (int i = files.size() - 1; i >= 0; i--) { // pass 2 delete dirs - not foolproof,
-                                                                          // we could sort and do a strict bottom-up
-                                File df = Storage.getFileFromNames(f, (List) files.get(i));
-                                df = df.getParentFile();
-                                if (df == null || !df.exists())
-                                    continue;
-                                if(df.delete())
+                            // step 2 make Set of dirs with reverse sort
+                            Set<File> dirs = new TreeSet(Collections.reverseOrder());
+                            for (List<String> list : files) {
+                                for (int i = 1; i < list.size(); i++) {
+                                    dirs.add(Storage.getFileFromNames(f, list.subList(0, i)));
+                                }
+                            }
+                            // step 3 delete dirs bottom-up
+                            for (File df : dirs) {
+                                if (df.delete()) {
                                    _manager.addMessage(_("Data dir deleted: {0}", df.getAbsolutePath()));
+                                } else if (_log.shouldLog(Log.WARN)) {
+                                    _log.warn("Could not delete dir " + df);
+                                }
+                            }
+                            // step 4 delete base
+                            if (f.delete()) {
+                                _manager.addMessage(_("Data dir deleted: {0}", f.getAbsolutePath()));
+                            } else if (_log.shouldLog(Log.WARN)) {
+                                _log.warn("Could not delete dir " + f);
                            }
                            break;
                        }
@ -611,6 +672,7 @@ public class I2PSnarkServlet extends Default {
            }
        } else if ("Save".equals(action)) {
            String dataDir = req.getParameter("dataDir");
+            boolean filesPublic = req.getParameter("filesPublic") != null;
            boolean autoStart = req.getParameter("autoStart") != null;
            String seedPct = req.getParameter("seedPct");
            String eepHost = req.getParameter("eepHost");
@ -620,19 +682,27 @@ public class I2PSnarkServlet extends Default {
            String i2cpOpts = buildI2CPOpts(req);
            String upLimit = req.getParameter("upLimit");
            String upBW = req.getParameter("upBW");
+            String refreshDel = req.getParameter("refreshDelay");
            String startupDel = req.getParameter("startupDelay");
            boolean useOpenTrackers = req.getParameter("useOpenTrackers") != null;
            String openTrackers = req.getParameter("openTrackers");
            String theme = req.getParameter("theme");
-            _manager.updateConfig(dataDir, autoStart, startupDel, seedPct, eepHost, eepPort, i2cpHost, i2cpPort, i2cpOpts, upLimit, upBW, useOpenTrackers, openTrackers, theme);
+            _manager.updateConfig(dataDir, filesPublic, autoStart, refreshDel, startupDel,
+                                  seedPct, eepHost, eepPort, i2cpHost, i2cpPort, i2cpOpts,
+                                  upLimit, upBW, useOpenTrackers, openTrackers, theme);
+        } else if ("Save2".equals(action)) {
+            String taction = req.getParameter("taction");
+            if (taction != null)
+                processTrackerForm(taction, req);
        } else if ("Create".equals(action)) {
            String baseData = req.getParameter("baseFile");
            if (baseData != null && baseData.trim().length() > 0) {
                File baseFile = new File(_manager.getDataDir(), baseData);
                String announceURL = req.getParameter("announceURL");
-                String announceURLOther = req.getParameter("announceURLOther");
-                if ( (announceURLOther != null) && (announceURLOther.trim().length() > "http://.i2p/announce".length()) )
-                    announceURL = announceURLOther;
+                // make the user add a tracker on the config form now
+                //String announceURLOther = req.getParameter("announceURLOther");
+                //if ( (announceURLOther != null) && (announceURLOther.trim().length() > "http://.i2p/announce".length()) )
+                //    announceURL = announceURLOther;

                if (announceURL == null || announceURL.length() <= 0)
                    _manager.addMessage(_("Error creating torrent - you must select a tracker"));
@ -643,7 +713,7 @@ public class I2PSnarkServlet extends Default {
                    try {
                        // This may take a long time to check the storage, but since it already exists,
                        // it shouldn't be THAT bad, so keep it in this thread.
-                        Storage s = new Storage(_manager.util(), baseFile, announceURL, null);
+                        Storage s = new Storage(_manager.util(), baseFile, announceURL, req.getParameter("private") != null, null);
                        s.close(); // close the files... maybe need a way to pass this Storage to addTorrent rather than starting over
                        MetaInfo info = s.getMetaInfo();
                        File torrentFile = new File(_manager.getDataDir(), s.getBaseName() + ".torrent");
@ -684,6 +754,56 @@ public class I2PSnarkServlet extends Default {
                if (snark.isStopped())
                    snark.startTorrent();
            }
+        } else if ("Clear".equals(action)) {
+            _manager.clearMessages();
+        } else {
+            _manager.addMessage("Unknown POST action: \"" + action + '\"');
+        }
+    }
+
+    /** @since 0.9 */
+    private void processTrackerForm(String action, HttpServletRequest req) {
+        if (action.equals(_("Delete selected"))) {
+            boolean changed = false;
+            Map<String, String> trackers = _manager.getTrackers();
+            Enumeration e = req.getParameterNames();
+            while (e.hasMoreElements()) {
+                 Object o = e.nextElement();
+                 if (!(o instanceof String))
+                     continue;
+                 String k = (String) o;
+                 if (!k.startsWith("delete_"))
+                     continue;
+                 k = k.substring(7);
+                 if (trackers.remove(k) != null) {
+                    _manager.addMessage(_("Removed") + ": " + k);
+                    changed = true;
+                }
+            }
+            if (changed) {
+                _manager.saveTrackerMap();
+            }
+        } else if (action.equals(_("Add tracker"))) {
+            String name = req.getParameter("tname");
+            String hurl = req.getParameter("thurl");
+            String aurl = req.getParameter("taurl");
+            if (name != null && hurl != null && aurl != null) {
+                name = name.trim();
+                hurl = hurl.trim();
+                aurl = aurl.trim().replace("=", "&#61;");
+                if (name.length() > 0 && hurl.startsWith("http://") && aurl.startsWith("http://")) {
+                    Map<String, String> trackers = _manager.getTrackers();
+                    trackers.put(name, aurl + '=' + hurl);
+                    _manager.saveTrackerMap();
+                } else {
+                    _manager.addMessage(_("Enter valid tracker name and URLs"));
+                }
+            } else {
+                _manager.addMessage(_("Enter valid tracker name and URLs"));
+            }
+        } else if (action.equals(_("Restore defaults"))) {
+            _manager.setDefaultTrackerMap();
+            _manager.addMessage(_("Restored default trackers"));
        } else {
            _manager.addMessage("Unknown POST action: \"" + action + '\"');
        }
@ -721,10 +841,10 @@ public class I2PSnarkServlet extends Default {
                l = l.substring(skip.length());
            if (r.startsWith(skip))
                r = r.substring(skip.length());
-            String llc = l.toLowerCase();
+            String llc = l.toLowerCase(Locale.US);
            if (llc.startsWith("the ") || llc.startsWith("the.") || llc.startsWith("the_"))
                l = l.substring(4);
-            String rlc = r.toLowerCase();
+            String rlc = r.toLowerCase(Locale.US);
            if (rlc.startsWith("the ") || rlc.startsWith("the.") || rlc.startsWith("the_"))
                r = r.substring(4);
            return collator.compare(l, r);
@ -765,8 +885,7 @@ public class I2PSnarkServlet extends Default {
            }
        }
        long total = snark.getTotalLength();
-        // Early typecast, avoid possibly overflowing a temp integer
-        long remaining = (long) snark.getNeeded() * (long) snark.getPieceLength(0); 
+        long remaining = snark.getRemainingLength(); 
        if (remaining > total)
            remaining = total;
        long downBps = snark.getDownloadRate();
@ -876,13 +995,14 @@ public class I2PSnarkServlet extends Default {
                out.write(trackerLink);
        }

+        String encodedBaseName = urlEncode(snark.getBaseName());
        // File type icon column
        out.write("</td>\n<td class=\"" + rowClass + "\">");
        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.
            StringBuilder buf = new StringBuilder(128);
-            buf.append("<a href=\"").append(snark.getBaseName())
+            buf.append("<a href=\"").append(encodedBaseName)
               .append("/\" title=\"").append(_("Torrent details"))
               .append("\">");
            out.write(buf.toString());
@ -905,7 +1025,7 @@ public class I2PSnarkServlet extends Default {
        out.write("</td><td class=\"snarkTorrentName " + rowClass + "\">");
        if (remaining == 0 || isMultiFile) {
            StringBuilder buf = new StringBuilder(128);
-            buf.append("<a href=\"").append(snark.getBaseName());
+            buf.append("<a href=\"").append(encodedBaseName);
            if (isMultiFile)
                buf.append('/');
            buf.append("\" title=\"");
@ -978,7 +1098,7 @@ public class I2PSnarkServlet extends Default {
                if (noThinsp)
                    out.write("<a href=\"/i2psnark/?action=Remove_" + b64 + "&amp;nonce=" + _nonce + "\"><img title=\"");
                else
-                    out.write("<input type=\"image\" name=\"action\" value=\"Remove_" + b64 + "\" title=\"");
+                    out.write("<input type=\"image\" name=\"action_Remove_" + b64 + "\" value=\"foo\" title=\"");
                out.write(_("Remove the torrent from the active list, deleting the .torrent file"));
                out.write("\" onclick=\"if (!confirm('");
                // Can't figure out how to escape double quotes inside the onclick string.
@ -1038,6 +1158,8 @@ public class I2PSnarkServlet extends Default {
                    client = "Robert";
                else if (ch.startsWith("LV")) // LVCS 1.0.2?; LVRS 1.0.4
                    client = "Transmission";
+                else if ("LUtU".equals(ch))
+                    client = "KTorrent";
                else
                    client = _("Unknown") + " (" + ch + ')';
                out.write(client + "&nbsp;&nbsp;<tt>" + peer.toString().substring(5, 9)+ "</tt>");
@ -1049,7 +1171,7 @@ public class I2PSnarkServlet extends Default {
                out.write("<td align=\"right\" class=\"snarkTorrentStatus " + rowClass + "\">");
                float pct;
                if (isValid) {
-                    pct = (float) (100.0 * (float) peer.completed() / meta.getPieces());
+                    pct = (float) (100.0 * peer.completed() / meta.getPieces());
                    if (pct == 100.0)
                        out.write(_("Seed"));
                    else {
@ -1166,8 +1288,9 @@ public class I2PSnarkServlet extends Default {
    }

    private void writeAddForm(PrintWriter out, HttpServletRequest req) throws IOException {
+        // display incoming parameter if a GET so links will work
        String newURL = req.getParameter("newURL");
-        if ( (newURL == null) || (newURL.trim().length() <= 0) )
+        if (newURL == null || newURL.trim().length() <= 0 || req.getMethod().equals("POST"))
            newURL = "";
        else
            newURL = DataHelper.stripHTML(newURL);    // XSS
@ -1189,12 +1312,12 @@ public class I2PSnarkServlet extends Default {
        out.write("</span><hr>\n<table border=\"0\"><tr><td>");
        out.write(_("From URL"));
        out.write(":<td><input type=\"text\" name=\"newURL\" size=\"85\" value=\"" + newURL + "\"");
-        out.write("title=\"");
-        out.write(_("Enter the torrent file download URL (I2P only), magnet link, or maggot link"));
+        out.write(" title=\"");
+        out.write(_("Enter the torrent file download URL (I2P only), magnet link, maggot link, or info hash"));
        out.write("\"> \n");
        // not supporting from file at the moment, since the file name passed isn't always absolute (so it may not resolve)
        //out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\" value=\"" + newFile + "\" /><br>");
-        out.write("<input type=\"submit\" value=\"");
+        out.write("<input type=\"submit\" class=\"add\" value=\"");
        out.write(_("Add torrent"));
        out.write("\" name=\"foo\" ><br>\n");
        out.write("<tr><td>&nbsp;<td><span class=\"snarkAddInfo\">");
@ -1212,7 +1335,7 @@ public class I2PSnarkServlet extends Default {
        else
            baseFile = DataHelper.stripHTML(baseFile);    // XSS
        
-        out.write("<div class=\"newtorrentsection\"><div class=\"snarkNewTorrent\">\n");
+        out.write("<a name=\"add\"></a><div class=\"newtorrentsection\"><div class=\"snarkNewTorrent\">\n");
        // *not* enctype="multipart/form-data", so that the input type=file sends the filename, not the file
        out.write("<form action=\"_post\" method=\"POST\">\n");
        out.write("<input type=\"hidden\" name=\"nonce\" value=\"" + _nonce + "\" >\n");
@ -1241,61 +1364,81 @@ public class I2PSnarkServlet extends Default {
        //out.write(_("Open trackers and DHT only"));
        out.write(_("Open trackers only"));
        out.write("</option>\n");
-        Map trackers = _manager.getTrackers();
-        for (Iterator iter = trackers.entrySet().iterator(); iter.hasNext(); ) {
-            Map.Entry entry = (Map.Entry)iter.next();
-            String name = (String)entry.getKey();
-            String announceURL = (String)entry.getValue();
+        Map<String, String> trackers = _manager.getTrackers();
+        for (Map.Entry<String, String> entry : trackers.entrySet()) {
+            String name = entry.getKey();
+            String announceURL = entry.getValue();
            int e = announceURL.indexOf('=');
            if (e > 0)
-                announceURL = announceURL.substring(0, e);
+                announceURL = announceURL.substring(0, e).replace("&#61;", "=");
            if (announceURL.equals(_lastAnnounceURL))
                announceURL += "\" selected=\"selected";
            out.write("\t<option value=\"" + announceURL + "\">" + name + "</option>\n");
        }
        out.write("</select>\n");
-        out.write(_("or"));
-        out.write("&nbsp;<input type=\"text\" name=\"announceURLOther\" size=\"57\" value=\"http://\" " +
-                  "title=\"");
-        out.write(_("Specify custom tracker announce URL"));
-        out.write("\" > ");
-        out.write("<input type=\"submit\" value=\"");
+        // make the user add a tracker on the config form now
+        //out.write(_("or"));
+        //out.write("&nbsp;<input type=\"text\" name=\"announceURLOther\" size=\"57\" value=\"http://\" " +
+        //          "title=\"");
+        //out.write(_("Specify custom tracker announce URL"));
+        //out.write("\" > " +
+        out.write(" <input type=\"submit\" class=\"create\" value=\"");
        out.write(_("Create torrent"));
-        out.write("\" name=\"foo\" ></table>\n");
-        out.write("</form></div></div>");        
+        out.write("\" name=\"foo\" >\n" +
+                  "</td></tr><tr><td>");
+        out.write(_("Private?"));
+        out.write(" </td><td> <input type=\"checkbox\" class=\"optbox\" name=\"private\" value=\"true\" title=\"");
+            out.write(_("Use for private trackers"));
+        out.write("\"");
+        if (req.getParameter("private") != null)
+            out.write(" checked");
+        out.write("></td></tr>" +
+                  "</table>\n" +
+                  "</form></div></div>");        
    }
    
+    private static final int[] times = { 5, 15, 30, 60, 2*60, 5*60, 10*60, 30*60, -1 };
+
    private void writeConfigForm(PrintWriter out, HttpServletRequest req) throws IOException {
        String dataDir = _manager.getDataDir().getAbsolutePath();
+        boolean filesPublic = _manager.areFilesPublic();
        boolean autoStart = _manager.shouldAutoStart();
        boolean useOpenTrackers = _manager.util().shouldUseOpenTrackers();
        String openTrackers = _manager.util().getOpenTrackerString();
        //int seedPct = 0;
       
-        out.write("<form action=\"/i2psnark/configure\" method=\"POST\">\n");
-        out.write("<div class=\"configsectionpanel\"><div class=\"snarkConfig\">\n");
-        out.write("<input type=\"hidden\" name=\"nonce\" value=\"" + _nonce + "\" >\n");
-        out.write("<input type=\"hidden\" name=\"action\" value=\"Save\" >\n");
-        out.write("<span class=\"snarkConfigTitle\">");
-        out.write("<img alt=\"\" border=\"0\" src=\"" + _imgPath + "config.png\"> ");
+        out.write("<form action=\"/i2psnark/configure\" method=\"POST\">\n" +
+                  "<div class=\"configsectionpanel\"><div class=\"snarkConfig\">\n" +
+                  "<input type=\"hidden\" name=\"nonce\" value=\"" + _nonce + "\" >\n" +
+                  "<input type=\"hidden\" name=\"action\" value=\"Save\" >\n" +
+                  "<span class=\"snarkConfigTitle\">" +
+                  "<img alt=\"\" border=\"0\" src=\"" + _imgPath + "config.png\"> ");
        out.write(_("Configuration"));
-        out.write("</span><hr>\n");
-        out.write("<table border=\"0\"><tr><td>");
+        out.write("</span><hr>\n"   +
+                  "<table border=\"0\"><tr><td>");

        out.write(_("Data directory"));
        out.write(": <td><code>" + dataDir + "</code> <i>(");
        out.write(_("Edit i2psnark.config and restart to change"));
-        out.write(")</i><br>\n");
+        out.write(")</i><br>\n" +

-        out.write("<tr><td>");
+                  "<tr><td>");
+        out.write(_("Files readable by all"));
+        out.write(": <td><input type=\"checkbox\" class=\"optbox\" name=\"filesPublic\" value=\"true\" " 
+                  + (filesPublic ? "checked " : "") 
+                  + "title=\"");
+        out.write(_("If checked, other users may access the downloaded files"));
+        out.write("\" >" +
+
+                  "<tr><td>");
        out.write(_("Auto start"));
        out.write(": <td><input type=\"checkbox\" class=\"optbox\" name=\"autoStart\" value=\"true\" " 
                  + (autoStart ? "checked " : "") 
                  + "title=\"");
        out.write(_("If checked, automatically start torrents that are added"));
-        out.write("\" >");
+        out.write("\" >" +

-        out.write("<tr><td>");
+                  "<tr><td>");
        out.write(_("Theme"));
        out.write(": <td><select name='theme'>");
        String theme = _manager.getTheme();
@ -1306,9 +1449,28 @@ public class I2PSnarkServlet extends Default {
            else
                out.write("\n<OPTION value=\"" + themes[i] + "\">" + themes[i]);
        }
-        out.write("</select>\n");
+        out.write("</select>\n" +

-        out.write("<tr><td>");
+                  "<tr><td>");
+        out.write(_("Refresh time"));
+        out.write(": <td><select name=\"refreshDelay\">");
+        int delay = _manager.getRefreshDelaySeconds();
+        for (int i = 0; i < times.length; i++) {
+            out.write("<option value=\"");
+            out.write(Integer.toString(times[i]));
+            out.write("\"");
+            if (times[i] == delay)
+                out.write(" selected=\"selected\"");
+            out.write(">");
+            if (times[i] > 0)
+                out.write(DataHelper.formatDuration2(times[i] * 1000));
+            else
+                out.write(_("Never"));
+            out.write("</option>\n");
+        }
+        out.write("</select><br>" +
+
+                  "<tr><td>");
        out.write(_("Startup delay"));
        out.write(": <td><input name=\"startupDelay\" size=\"3\" class=\"r\" value=\"" + _manager.util().getStartupDelay() + "\"> ");
        out.write(_("minutes"));
@ -1321,15 +1483,15 @@ public class I2PSnarkServlet extends Default {
 /*
        out.write("Seed percentage: <select name=\"seedPct\" disabled=\"true\" >\n\t");
        if (seedPct <= 0)
-            out.write("<option value=\"0\" selected=\"true\">Unlimited</option>\n\t");
+            out.write("<option value=\"0\" selected=\"selected\">Unlimited</option>\n\t");
        else
            out.write("<option value=\"0\">Unlimited</option>\n\t");
        if (seedPct == 100)
-            out.write("<option value=\"100\" selected=\"true\">100%</option>\n\t");
+            out.write("<option value=\"100\" selected=\"selected\">100%</option>\n\t");
        else
            out.write("<option value=\"100\">100%</option>\n\t");
        if (seedPct == 150)
-            out.write("<option value=\"150\" selected=\"true\">150%</option>\n\t");
+            out.write("<option value=\"150\" selected=\"selected\">150%</option>\n\t");
        else
            out.write("<option value=\"150\">150%</option>\n\t");
        out.write("</select><br>\n");
@ -1339,26 +1501,26 @@ public class I2PSnarkServlet extends Default {
        out.write(": <td><input type=\"text\" name=\"upLimit\" class=\"r\" value=\""
                  + _manager.util().getMaxUploaders() + "\" size=\"3\" maxlength=\"3\" > ");
        out.write(_("peers"));
-        out.write("<br>\n");
+        out.write("<br>\n" +

-        out.write("<tr><td>");
+                  "<tr><td>");
        out.write(_("Up bandwidth limit"));
        out.write(": <td><input type=\"text\" name=\"upBW\" class=\"r\" value=\""
-                  + _manager.util().getMaxUpBW() + "\" size=\"3\" maxlength=\"3\" > KBps <i>(");
+                  + _manager.util().getMaxUpBW() + "\" size=\"3\" maxlength=\"3\" > KBps <i>");
        out.write(_("Half available bandwidth recommended."));
-        out.write(" <a href=\"/config.jsp\" target=\"blank\">");
+        out.write("<br><a href=\"/config.jsp\" target=\"blank\">");
        out.write(_("View or change router bandwidth"));
-        out.write("</a>)</i><br>\n");
+        out.write("</a></i><br>\n" +
        
-        out.write("<tr><td>");
+                  "<tr><td>");
        out.write(_("Use open trackers also"));
        out.write(": <td><input type=\"checkbox\" class=\"optbox\" name=\"useOpenTrackers\" value=\"true\" " 
                  + (useOpenTrackers ? "checked " : "") 
                  + "title=\"");
        out.write(_("If checked, announce torrents to open trackers as well as the tracker listed in the torrent file"));
-        out.write("\" > ");
+        out.write("\" > " +

-        out.write("<tr><td>");
+                  "<tr><td>");
        out.write(_("Open tracker announce URLs"));
        out.write(": <td><input type=\"text\" name=\"openTrackers\" value=\""
                  + openTrackers + "\" size=\"50\" ><br>\n");
@ -1387,36 +1549,89 @@ public class I2PSnarkServlet extends Default {
            out.write("<tr><td>");
            out.write(_("I2CP host"));
            out.write(": <td><input type=\"text\" name=\"i2cpHost\" value=\"" 
-                      + _manager.util().getI2CPHost() + "\" size=\"15\" > ");
+                      + _manager.util().getI2CPHost() + "\" size=\"15\" > " +

-            out.write("<tr><td>");
+                      "<tr><td>");
            out.write(_("I2CP port"));
            out.write(": <td><input type=\"text\" name=\"i2cpPort\" class=\"r\" value=\"" +
                      + _manager.util().getI2CPPort() + "\" size=\"5\" maxlength=\"5\" > <br>\n");
        }

+        options.remove(I2PSnarkUtil.PROP_MAX_BW);
+        // was accidentally in the I2CP options prior to 0.8.9 so it will be in old config files
+        options.remove(SnarkManager.PROP_OPENTRACKERS);
        StringBuilder opts = new StringBuilder(64);
-        for (Iterator iter = options.entrySet().iterator(); iter.hasNext(); ) {
-            Map.Entry entry = (Map.Entry)iter.next();
-            String key = (String)entry.getKey();
-            String val = (String)entry.getValue();
+        for (Map.Entry<String, String> e : options.entrySet()) {
+            String key = e.getKey();
+            String val = e.getValue();
            opts.append(key).append('=').append(val).append(' ');
        }
        out.write("<tr><td>");
        out.write(_("I2CP options"));
        out.write(": <td><textarea name=\"i2cpOpts\" cols=\"60\" rows=\"1\" wrap=\"off\" spellcheck=\"false\" >"
-                  + opts.toString() + "</textarea><br>\n");
+                  + opts.toString() + "</textarea><br>\n" +

-        out.write("<tr><td>&nbsp;<td><input type=\"submit\" value=\"");
+                  "<tr><td>&nbsp;<td><input type=\"submit\" class=\"accept\" value=\"");
        out.write(_("Save configuration"));
-        out.write("\" name=\"foo\" >\n");
-        out.write("</table></div></div></form>");
+        out.write("\" name=\"foo\" >\n" +
+                  "</table></div></div></form>");
    }
    
+    /** @since 0.9 */
+    private void writeTrackerForm(PrintWriter out, HttpServletRequest req) throws IOException {
+        StringBuilder buf = new StringBuilder(1024);
+        buf.append("<form action=\"/i2psnark/configure\" method=\"POST\">\n" +
+                  "<div class=\"configsectionpanel\"><div class=\"snarkConfig\">\n" +
+                  "<input type=\"hidden\" name=\"nonce\" value=\"" + _nonce + "\" >\n" +
+                  "<input type=\"hidden\" name=\"action\" value=\"Save2\" >\n" +
+                  "<span class=\"snarkConfigTitle\">" +
+                  "<img alt=\"\" border=\"0\" src=\"" + _imgPath + "config.png\"> ");
+        buf.append(_("Trackers"));
+        buf.append("</span><hr>\n"   +
+                   "<table><tr><th>")
+           //.append(_("Remove"))
+           .append("</th><th>")
+           .append(_("Name"))
+           .append("</th><th>")
+           .append(_("Website URL"))
+           .append("</th><th>")
+           .append(_("Announce URL"))
+           .append("</th></tr>\n");
+        Map<String, String> trackers = _manager.getTrackers();
+        for (Map.Entry<String, String> entry : trackers.entrySet()) {
+            String name = entry.getKey();
+            String announceURL = entry.getValue();
+            int e = announceURL.indexOf('=');
+            if (e <= 0)
+                continue;
+            String homeURL = announceURL.substring(e + 1);
+            announceURL = announceURL.substring(0, e).replace("&#61;", "=");
+            buf.append("<tr><td align=\"center\"><input type=\"checkbox\" class=\"optbox\" name=\"delete_")
+               .append(name).append("\">" +
+                       "</td><td align=\"left\">").append(name)
+               .append("</td><td align=\"left\">").append(urlify(homeURL, 35))
+               .append("</td><td align=\"left\">").append(urlify(announceURL, 35))
+               .append("</td></tr>\n");
+        }
+        buf.append("<tr><td align=\"center\"><b>")
+           .append(_("Add")).append(":</b></td>" +
+                   "<td align=\"left\"><input type=\"text\" size=\"16\" name=\"tname\"></td>" +
+                   "<td align=\"left\"><input type=\"text\" size=\"40\" name=\"thurl\"></td>" +
+                   "<td align=\"left\"><input type=\"text\" size=\"40\" name=\"taurl\"></td></tr>\n" +
+                   "<tr><td colspan=\"2\"></td><td colspan=\"2\" align=\"left\">\n" +
+                   "<input type=\"submit\" name=\"taction\" class=\"default\" value=\"").append(_("Add tracker")).append("\">\n" +
+                   "<input type=\"submit\" name=\"taction\" class=\"delete\" value=\"").append(_("Delete selected")).append("\">\n" +
+                   // "<input type=\"reset\" class=\"cancel\" value=\"").append(_("Cancel")).append("\">\n" +
+                   "<input type=\"submit\" name=\"taction\" class=\"reload\" value=\"").append(_("Restore defaults")).append("\">\n" +
+                   "<input type=\"submit\" name=\"taction\" class=\"add\" value=\"").append(_("Add tracker")).append("\">\n" +
+                   "</td></tr></table></div></div></form>\n");
+        out.write(buf.toString());
+    }
+
    private void writeConfigLink(PrintWriter out) throws IOException {
-        out.write("<div class=\"configsection\"><span class=\"snarkConfig\">\n");
-        out.write("<span class=\"snarkConfigTitle\"><a href=\"configure\">");
-        out.write("<img alt=\"\" border=\"0\" src=\"" + _imgPath + "config.png\"> ");
+        out.write("<div class=\"configsection\"><span class=\"snarkConfig\">\n" +
+                  "<span class=\"snarkConfigTitle\"><a href=\"configure\">" +
+                  "<img alt=\"\" border=\"0\" src=\"" + _imgPath + "config.png\"> ");
        out.write(_("Configuration"));
        out.write("</a></span></span></div>\n");
    }
@ -1514,7 +1729,7 @@ public class I2PSnarkServlet extends Default {
        for (int i = min; i <= max; i++) {
            buf.append("<option value=\"").append(i).append("\" ");
            if (i == now)
-                buf.append("selected=\"true\" ");
+                buf.append("selected=\"selected\" ");
            // constants to prevent tagging
            buf.append(">").append(ngettext(DUMMY1 + name, DUMMY0 + name + 's', i));
            buf.append("</option>\n");
@ -1562,12 +1777,27 @@ public class I2PSnarkServlet extends Default {
    
    /** @since 0.7.14 */
    private static String urlify(String s) {
+        return urlify(s, 100);
+    }
+    
+    /** @since 0.9 */
+    private static String urlify(String s, int max) {
        StringBuilder buf = new StringBuilder(256);
        // browsers seem to work without doing this but let's be strict
-        String link = s.replace("&", "&amp;").replace(" ", "%20");
-        buf.append("<a href=\"").append(link).append("\">").append(link).append("</a>");
+        String link = urlEncode(s);
+        String display;
+        if (s.length() <= max)
+            display = link;
+        else
+            display = urlEncode(s.substring(0, max)) + "&hellip;";
+        buf.append("<a href=\"").append(link).append("\">").append(display).append("</a>");
        return buf.toString();
    }
+    
+    /** @since 0.8.13 */
+    private static String urlEncode(String s) {
+        return s.replace(";", "%3B").replace("&", "&amp;").replace(" ", "%20");
+    }

    private static final String DOCTYPE = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n";
    private static final String HEADER_A = "<link href=\"";
@ -1621,7 +1851,7 @@ public class I2PSnarkServlet extends Default {
        
        StringBuilder buf=new StringBuilder(4096);
        buf.append(DOCTYPE + "<HTML><HEAD><TITLE>");
-        String title = URI.decodePath(base);
+        String title = URIUtil.decodePath(base);
        if (title.startsWith("/i2psnark/"))
            title = title.substring("/i2psnark/".length());

@ -1700,7 +1930,14 @@ public class I2PSnarkServlet extends Default {
            // We don't have the hash of the torrent file
            //buf.append("<br>").append(_("Maggot link")).append(": <a href=\"").append(MAGGOT).append(hex).append(':').append(hex).append("\">")
            //   .append(MAGGOT).append(hex).append(':').append(hex).append("</a>");
+            buf.append("<br>").append(_("Torrent file")).append(": ").append(snark.getName());
            buf.append("</div></th></tr>");
+        } else {
+            // shouldn't happen
+            buf.append("<tr><th>Not found<br>resource=\"").append(r.toString())
+               .append("\"<br>base=\"").append(base)
+               .append("\"<br>torrent=\"").append(torrentName)
+               .append("\"</th></tr>");
        }
        if (ls == null) {
            // We are only showing the torrent info section
@ -1723,7 +1960,7 @@ public class I2PSnarkServlet extends Default {
            .append(_("Priority")).append("</th>");
        buf.append("</tr></thead>\n");
        buf.append("<tr><td colspan=\"" + (showPriority ? '4' : '3') + "\" class=\"ParentDir\"><A HREF=\"");
-        buf.append(URI.addPaths(base,"../"));
+        buf.append(URIUtil.addPaths(base,"../"));
        buf.append("\"><img alt=\"\" border=\"0\" src=\"" + _imgPath + "up.png\"> ")
            .append(_("Up to higher level directory")).append("</A></td></tr>\n");

@ -1733,7 +1970,7 @@ public class I2PSnarkServlet extends Default {
        boolean showSaveButton = false;
        for (int i=0 ; i< ls.length ; i++)
        {   
-            String encoded=URI.encodePath(ls[i]);
+            String encoded=URIUtil.encodePath(ls[i]);
            // bugfix for I2P - Backport from Jetty 6 (zero file lengths and last-modified times)
            // http://jira.codehaus.org/browse/JETTY-361?page=com.atlassian.jira.plugin.system.issuetabpanels%3Achangehistory-tabpanel#issue-tabs
            // See resource.diff attachment
@ -1789,15 +2026,15 @@ public class I2PSnarkServlet extends Default {
                }
            }

-            String path=URI.addPaths(base,encoded);
+            String path=URIUtil.addPaths(base,encoded);
            if (item.isDirectory() && !path.endsWith("/"))
-                path=URI.addPaths(path,"/");
+                path=URIUtil.addPaths(path,"/");
            String icon = toIcon(item);

            if (complete) {
                buf.append("<a href=\"").append(path).append("\">");
                // thumbnail ?
-                String plc = item.toString().toLowerCase();
+                String plc = item.toString().toLowerCase(Locale.US);
                if (plc.endsWith(".jpg") || plc.endsWith(".jpeg") || plc.endsWith(".png") ||
                    plc.endsWith(".gif") || plc.endsWith(".ico")) {
                    buf.append("<img alt=\"\" border=\"0\" class=\"thumb\" src=\"")
@ -1847,7 +2084,7 @@ public class I2PSnarkServlet extends Default {
            buf.append("</TR>\n");
        }
        if (showSaveButton) {
-            buf.append("<thead><tr><th colspan=\"3\">&nbsp;</th><th align=\"center\"><input type=\"submit\" value=\"");
+            buf.append("<thead><tr><th colspan=\"3\">&nbsp;</th><th class=\"headerpriority\"><input type=\"submit\" value=\"");
            buf.append(_("Save priorities"));
            buf.append("\" name=\"foo\" ></th></tr></thead>\n");
        }
@ -1877,7 +2114,7 @@ public class I2PSnarkServlet extends Default {
        // instead of this mishmash. We can't get to HttpContext.setMimeMapping()
        // from here? We could do it from a web.xml perhaps.
        // Or could we put our own org/mortbay/http/mime.properties file in the war?
-        String plc = path.toLowerCase();
+        String plc = path.toLowerCase(Locale.US);
        String mime = getServletContext().getMimeType(path);
        if (mime == null)
            mime = "";
@ -1919,12 +2156,12 @@ public class I2PSnarkServlet extends Default {
    
    /** @since 0.7.14 */
    private static String toImg(String icon) {
-        return "<img alt=\"\" height=\"16\" width=\"16\" src=\"/i2psnark/_icons/" + icon + ".png\">";
+        return "<img alt=\"\" height=\"16\" width=\"16\" src=\"/i2psnark/.icons/" + icon + ".png\">";
    }

    /** @since 0.8.2 */
    private static String toImg(String icon, String altText) {
-        return "<img alt=\"" + altText + "\" height=\"16\" width=\"16\" src=\"/i2psnark/_icons/" + icon + ".png\">";
+        return "<img alt=\"" + altText + "\" height=\"16\" width=\"16\" src=\"/i2psnark/.icons/" + icon + ".png\">";
    }

    /** @since 0.8.1 */
@ -2000,7 +2237,21 @@ private static class FetchAndAdd implements Runnable {
                    try { if (in != null) in.close(); } catch (IOException ioe) {}
                }
            } else {
-                _manager.addMessage(_("Torrent was not retrieved from {0}", urlify(_url)));
+                // Generate a retry link, but sadly can't have a form inside a table
+                // So make this an ugly GET
+                StringBuilder buf = new StringBuilder(1024);
+                // FIXME don't lose peer setting
+                //String peerParam = req.getParameter("p");
+                //if (peerParam != null)
+                //    buf.append("<input type=\"hidden\" name=\"p\" value=\"").append(peerParam).append("\" >\n");
+                buf.append(_("Torrent was not retrieved from {0}", urlify(_url)));
+             /**** FIXME ticket #575
+                String link = urlEncode(_url).replace(":", "%3A").replace("/", "%2F");
+                buf.append(" - [<a href=\"/i2psnark/?newURL=").append(link).append("#add\" >");
+                buf.append(_("Retry"));
+                buf.append("</a>]");
+              ****/
+                _manager.addMessage(buf.toString());
            }
        } finally {
            if (file != null) file.delete();
--- a/apps/i2psnark/java/src/org/klomp/snark/web/RunStandalone.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/RunStandalone.java
@ -8,8 +8,6 @@ import net.i2p.util.FileUtil;
 import org.mortbay.jetty.Server;

 public class RunStandalone {
-    private Server _server;
-    
    static {
        System.setProperty("org.mortbay.http.Version.paranoid", "true");
        System.setProperty("org.mortbay.xml.XmlParser.NotValidating", "true");
@ -31,6 +29,8 @@ public class RunStandalone {
        if (!workDirCreated)
            System.err.println("ERROR: Unable to create Jetty temporary work directory");
        
+        throw new RuntimeException("unsupported");
+/****
        try {
            _server = new Server("jetty-i2psnark.xml");
            // just blow up NPE if we don't have a context
@ -39,13 +39,17 @@ public class RunStandalone {
        } catch (Exception e) {
            e.printStackTrace();
        }
+****/
    }
    
    public void stop() {
+        throw new RuntimeException("unsupported");
+/****
        try {
            _server.stop();
        } catch (InterruptedException ie) {
            ie.printStackTrace();
        }
+****/
    }
 }
--- a/apps/i2psnark/locale/messages_cs.po
+++ b/apps/i2psnark/locale/messages_cs.po
@ -0,0 +1,988 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2psnark package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-02-17 11:41+0000\n"
+"PO-Revision-Date: 2012-02-12 20:06+0000\n"
+"Last-Translator: Waseihou Watashi <waseihou@gmail.com>\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/src/org/klomp/snark/SnarkManager.java:355
+#, java-format
+msgid "Total uploaders limit changed to {0}"
+msgstr "Celkový limit sdílečů změněn na {0}"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:357
+#, java-format
+msgid "Minimum total uploaders limit is {0}"
+msgstr "Nejmenší celkový limit sdílečů je {0}"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:369
+#, java-format
+msgid "Up BW limit changed to {0}KBps"
+msgstr "Horní BW limit změněn na {0}KBps"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:371
+#, java-format
+msgid "Minimum up bandwidth limit is {0}KBps"
+msgstr "Nejmenší horní limit přenosové rychlist je {0}KBps"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:383
+#, java-format
+msgid "Startup delay changed to {0}"
+msgstr "Prodleva při startu změněna na {0}"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:394
+#, java-format
+msgid "Refresh time changed to {0}"
+msgstr "Doba aktualizace stavu (refresh time) změněna na {0}"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:396
+msgid "Refresh disabled"
+msgstr "Aktualizace stavu vypnuta"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:451
+msgid "I2CP and tunnel changes will take effect after stopping all torrents"
+msgstr "Změny I2CP a tunelu se projeví až po zastavení všech torrentů"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:455
+#, java-format
+msgid "I2CP options changed to {0}"
+msgstr "Nastavení (options) I2CP změněno na {0}"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:460
+msgid "Disconnecting old I2CP destination"
+msgstr "Odpojuji se od starého I2CP cíle"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:462
+#, java-format
+msgid "I2CP settings changed to {0}"
+msgstr "Nastavení (settings) I2CP změněno na {0}"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:467
+msgid ""
+"Unable to connect with the new settings, reverting to the old I2CP settings"
+msgstr "Nemůžu se připojit s novým nastavením I2CP, vracím se k předhozímu."
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:471
+msgid "Unable to reconnect with the old settings!"
+msgstr "Nemohu se opětovně připojit ani s předchozím nastavením!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:473
+msgid "Reconnected on the new I2CP destination"
+msgstr "Opětovně připojeno k novému I2CP cíli"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:480
+#, java-format
+msgid "I2CP listener restarted for \"{0}\""
+msgstr "I2CP listener restartován pro \"{0}\""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:492
+msgid "New files will be publicly readable"
+msgstr "Nové soubory budou veřejně přístupné"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:494
+msgid "New files will not be publicly readable"
+msgstr "Nové soubory nebudou veřejně přístupné"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:501
+msgid "Enabled autostart"
+msgstr "Automatické spuštění zapnuto"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:503
+msgid "Disabled autostart"
+msgstr "Automatické spuštění vypnuto"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:509
+msgid "Enabled open trackers - torrent restart required to take effect."
+msgstr "Zapnuto automatické spuštění"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:511
+msgid "Disabled open trackers - torrent restart required to take effect."
+msgstr ""
+"Otevřené trackery vypnuty - aby se změna projevila je nutné restartovat "
+"všechny torrenty"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:519
+msgid "Open Tracker list changed - torrent restart required to take effect."
+msgstr ""
+"Seznam otevřených trackerů změněn - aby se změna projevila je nutné "
+"restartovat všechny torrenty"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:526
+#, java-format
+msgid "{0} theme loaded, return to main i2psnark page to view."
+msgstr "Téma {0} bylo nahráno, přejděte prosím na hlavní stránku i2snark"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:533
+msgid "Configuration unchanged."
+msgstr "Nastavení nebylo změněno."
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:543
+#, java-format
+msgid "Unable to save the config to {0}"
+msgstr "Nemůžu uložit soubor s nastavením do souboru {0}"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:608
+msgid "Connecting to I2P"
+msgstr "Připojuji se k I2P"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:611
+msgid "Error connecting to I2P - check your I2CP settings!"
+msgstr ""
+"Při připojování k I2P nastala chyba, zkontrolujte prosím nastavení I2CP!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:620
+#, java-format
+msgid "Error: Could not add the torrent {0}"
+msgstr "Chyba: nepodařilo se přidat torrent {0}"
+
+#. catch this here so we don't try do delete it below
+#: ../java/src/org/klomp/snark/SnarkManager.java:642
+#, java-format
+msgid "Cannot open \"{0}\""
+msgstr "Nejde otevřít \"{0}\""
+
+#. TODO - if the existing one is a magnet, delete it and add the metainfo instead?
+#: ../java/src/org/klomp/snark/SnarkManager.java:661
+#: ../java/src/org/klomp/snark/SnarkManager.java:737
+#: ../java/src/org/klomp/snark/SnarkManager.java:792
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2048
+#, java-format
+msgid "Torrent with this info hash is already running: {0}"
+msgstr "Torrent s tímto infohašišem již běží: {0}"
+
+#. addMessage(_("Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and DHT only.", info.getName()));
+#: ../java/src/org/klomp/snark/SnarkManager.java:668
+#, java-format
+msgid ""
+"Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers "
+"only."
+msgstr ""
+"Varování - v \"{0}\" nebyly nalezeny žádné I2P trackery, budou použity pouze "
+"otevrené I2P trackery."
+
+#. addMessage(_("Warning - No I2P trackers in \"{0}\", and DHT and open trackers are disabled, you should enable open trackers or DHT before starting the torrent.", info.getName()));
+#: ../java/src/org/klomp/snark/SnarkManager.java:673
+#, java-format
+msgid ""
+"Warning - No I2P Trackers found in \"{0}\". Make sure Open Tracker is "
+"enabled before starting this torrent."
+msgstr ""
+"Varování - v \"{0}\" nebyly nalezeny žádné I2P trackery, před spuštěním "
+"tohoto torrentu se ujistěte že otevřené trackery jsou povoleny."
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:694
+#, java-format
+msgid "Torrent in \"{0}\" is invalid"
+msgstr "Torrent v \"{0}\" je chybný"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:699
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2070
+#, java-format
+msgid "ERROR - Out of memory, cannot create torrent from {0}"
+msgstr "CHYBA - nedostatek paměti, nemohu vytvořit torrent z {0}"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:711
+#, java-format
+msgid "Torrent added and started: \"{0}\""
+msgstr "Torrent přidán a spuštěn: \"{0}\""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:713
+#, java-format
+msgid "Torrent added: \"{0}\""
+msgstr "Torrent přidán:  \"{0}\""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:748
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:499
+#, java-format
+msgid "Fetching {0}"
+msgstr "Získávám {0}"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:751
+#, java-format
+msgid ""
+"We have no saved peers and no other torrents are running. Fetch of {0} will "
+"not succeed until you start another torrent."
+msgstr ""
+"Nejsou uloženi žádní sdíleči a žádné další torrenty neběží. Získání {0} "
+"neuspěje dokud nespustíte nějaký další torrent."
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:755
+#, java-format
+msgid "Adding {0}"
+msgstr "Přídávám {0}"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:802
+#: ../java/src/org/klomp/snark/SnarkManager.java:825
+#: ../java/src/org/klomp/snark/SnarkManager.java:1260
+#, java-format
+msgid "Failed to copy torrent file to {0}"
+msgstr "Chyba: nepodařilo se zkopírovat soubor torrentu do {0}"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1052
+#, java-format
+msgid "Too many files in \"{0}\" ({1}), deleting it!"
+msgstr "V \"{0}\" ({1}) je příliš mnoho souborů, mažu je!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1054
+#, java-format
+msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
+msgstr "Jméno souboru torrentu \"{0}\" nemůže končit na \".torrent\", mažu ho!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1056
+#, java-format
+msgid "No pieces in \"{0}\",  deleting it!"
+msgstr "\"{0}\" neobsahuje žádné části, mažu to!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1058
+#, java-format
+msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
+msgstr "Příliš mnoho částí v \"{0}\", maximum je {1}, mažu to!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1060
+#, java-format
+msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1061
+#, java-format
+msgid "Limit is {0}B"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1063
+#, java-format
+msgid "Torrent \"{0}\" has no data, deleting it!"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1071
+#, java-format
+msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1087
+#, java-format
+msgid "Error: Could not remove the torrent {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1108
+#: ../java/src/org/klomp/snark/SnarkManager.java:1126
+#, java-format
+msgid "Torrent stopped: \"{0}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1147
+#, java-format
+msgid "Torrent removed: \"{0}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1155
+#, java-format
+msgid "Adding torrents in {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1208
+#, java-format
+msgid "Download finished: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1256
+#, java-format
+msgid "Metainfo received for {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1257
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534
+#, java-format
+msgid "Starting up torrent {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1313
+msgid "Unable to connect to I2P!"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1319
+#, java-format
+msgid "Unable to add {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:205
+msgid "I2PSnark - Anonymous BitTorrent Client"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:221
+msgid "Torrents"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:224
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:231
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1053
+msgid "I2PSnark"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:228
+msgid "Refresh page"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:233
+msgid "Forum"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:251
+msgid "Click \"Add torrent\" button to fetch torrent"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:290
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1791
+msgid "Status"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:296
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:298
+msgid "Hide Peers"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:303
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:305
+msgid "Show Peers"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:312
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1724
+msgid "Torrent"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:316
+msgid "Estimated time remaining"
+msgstr ""
+
+#. Translators: Please keep short or translate as " "
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:319
+msgid "ETA"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:323
+msgid "Downloaded"
+msgstr ""
+
+#. Translators: Please keep short or translate as " "
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:326
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:340
+msgid "RX"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:330
+msgid "Uploaded"
+msgstr ""
+
+#. Translators: Please keep short or translate as " "
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:333
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:350
+msgid "TX"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:338
+msgid "Down Rate"
+msgstr ""
+
+#. Translators: Please keep short or translate as " "
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:352
+msgid "Rate"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:348
+msgid "Up Rate"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:372
+msgid "Stop all torrents and the I2P tunnel"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:374
+msgid "Stop All"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:383
+msgid "Start all torrents and the I2P tunnel"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:385
+msgid "Start All"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:404
+msgid "No torrents loaded."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:409
+msgid "Totals"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:411
+#, java-format
+msgid "1 torrent"
+msgid_plural "{0} torrents"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:414
+#, java-format
+msgid "1 connected peer"
+msgid_plural "{0} connected peers"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:498
+msgid "Opening the I2P tunnel"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:505
+#, java-format
+msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:553
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580
+#, java-format
+msgid "Magnet deleted: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:561
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:586
+#, java-format
+msgid "Torrent file deleted: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:592
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:603
+#, java-format
+msgid "Data file deleted: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:594
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:605
+#, java-format
+msgid "Data file could not be deleted: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:624
+#, java-format
+msgid "Data dir deleted: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+msgid "Error creating torrent - you must select a tracker"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:678
+#, java-format
+msgid "Torrent created for \"{0}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680
+#, java-format
+msgid ""
+"Many I2P trackers require you to register new torrents before seeding - "
+"please do so before starting \"{0}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:682
+#, java-format
+msgid "Error creating a torrent for \"{0}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:685
+#, java-format
+msgid "Cannot create a torrent for the nonexistent data: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:688
+msgid "Error creating torrent - you must enter a file or directory"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:691
+msgid "Stopping all torrents and closing the I2P tunnel."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:702
+msgid "I2P tunnel closed."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:705
+msgid "Opening the I2P tunnel and starting all torrents."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:827
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:832
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:838
+msgid "Tracker Error"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:830
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:834
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:846
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:850
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:858
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:867
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:871
+#, java-format
+msgid "1 peer"
+msgid_plural "{0} peers"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:843
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:848
+msgid "Seeding"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:852
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1842
+msgid "Complete"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:855
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:860
+msgid "OK"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:864
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:869
+msgid "Stalled"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:873
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:876
+msgid "No Peers"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:878
+msgid "Stopped"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:911
+msgid "Torrent details"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:923
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1187
+msgid "Info"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:938
+msgid "View files"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:940
+msgid "Open file"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:982
+msgid "Stop the torrent"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:984
+msgid "Stop"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:994
+msgid "Start the torrent"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:996
+msgid "Start"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1007
+msgid "Remove the torrent from the active list, deleting the .torrent file"
+msgstr ""
+
+#. Can't figure out how to escape double quotes inside the onclick string.
+#. Single quotes in translate strings with parameters must be doubled.
+#. Then the remaining single quite must be escaped
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1012
+#, java-format
+msgid ""
+"Are you sure you want to delete the file \\''{0}.torrent\\'' (downloaded "
+"data will not be deleted) ?"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1015
+msgid "Remove"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1026
+msgid "Delete the .torrent file and the associated data file(s)"
+msgstr ""
+
+#. Can't figure out how to escape double quotes inside the onclick string.
+#. Single quotes in translate strings with parameters must be doubled.
+#. Then the remaining single quite must be escaped
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1031
+#, java-format
+msgid ""
+"Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded "
+"data?"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1034
+msgid "Delete"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1069
+msgid "Unknown"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1081
+msgid "Seed"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1104
+msgid "Uninteresting (The peer has no pieces we need)"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1106
+msgid "Choked (The peer is not allowing us to request pieces)"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1126
+msgid "Uninterested (We have no pieces the peer needs)"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1128
+msgid "Choking (We are not allowing the peer to request pieces)"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1186
+#, java-format
+msgid "Details at {0} tracker"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1216
+msgid "Add Torrent"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1218
+msgid "From URL"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1221
+msgid ""
+"Enter the torrent file download URL (I2P only), magnet link, or maggot link"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1226
+msgid "Add torrent"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229
+#, java-format
+msgid "You can also copy .torrent files to: {0}."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231
+msgid "Removing a .torrent will cause it to stop."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1254
+msgid "Create Torrent"
+msgstr ""
+
+#. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\" value=\"" + newFile + "\" /><br>\n");
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1257
+msgid "Data to seed"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1261
+msgid "File or directory to seed (must be within the specified path)"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1263
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1749
+msgid "Tracker"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1265
+msgid "Select a tracker"
+msgstr ""
+
+#. out.write(_("Open trackers and DHT only"));
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1270
+msgid "Open trackers only"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1285
+msgid "or"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
+msgid "Specify custom tracker announce URL"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1291
+msgid "Create torrent"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1312
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1480
+msgid "Configuration"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1316
+msgid "Data directory"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1318
+msgid "Edit i2psnark.config and restart to change"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1322
+msgid "Files readable by all"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1326
+msgid "If checked, other users may access the downloaded files"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1330
+msgid "Auto start"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1334
+msgid "If checked, automatically start torrents that are added"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1338
+msgid "Theme"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351
+msgid "Refresh time"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364
+msgid "Never"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1370
+msgid "Startup delay"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1372
+msgid "minutes"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1396
+msgid "Total uploader limit"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1399
+msgid "peers"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1403
+msgid "Up bandwidth limit"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1406
+msgid "Half available bandwidth recommended."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1408
+msgid "View or change router bandwidth"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1412
+msgid "Use open trackers also"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1416
+msgid ""
+"If checked, announce torrents to open trackers as well as the tracker listed "
+"in the torrent file"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1420
+msgid "Open tracker announce URLs"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1432
+msgid "Inbound Settings"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1438
+msgid "Outbound Settings"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1446
+msgid "I2CP host"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1451
+msgid "I2CP port"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1466
+msgid "I2CP options"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1471
+msgid "Save configuration"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1496
+#, java-format
+msgid "Invalid magnet URL {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530
+#, java-format
+msgid "Invalid info hash in magnet URL {0}"
+msgstr ""
+
+#. * dummies for translation
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1560
+#, java-format
+msgid "1 hop"
+msgid_plural "{0} hops"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1561
+#, java-format
+msgid "1 tunnel"
+msgid_plural "{0} tunnels"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1728
+msgid "Completion"
+msgstr ""
+
+#. else unknown
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1732
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1788
+msgid "Size"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1737
+msgid "Files"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1739
+msgid "Pieces"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1740
+msgid "Piece size"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1762
+msgid "Magnet link"
+msgstr ""
+
+#. We don't have the hash of the torrent file
+#. buf.append("<br>").append(_("Maggot link")).append(": <a href=\"").append(MAGGOT).append(hex).append(':').append(hex).append("\">")
+#. .append(MAGGOT).append(hex).append(':').append(hex).append("</a>");
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1768
+msgid "Torrent file"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1786
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825
+msgid "Directory"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1795
+msgid "Priority"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1800
+msgid "Up to higher level directory"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1830
+msgid "Torrent not found?"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1839
+msgid "File not found in torrent?"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1852
+msgid "complete"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1853
+msgid "bytes remaining"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1878
+msgid "Open"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1904
+msgid "High"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1909
+msgid "Normal"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1914
+msgid "Skip"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1923
+msgid "Save priorities"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2039
+#, java-format
+msgid "Torrent fetched from {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2060
+#, java-format
+msgid "Torrent already running: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062
+#, java-format
+msgid "Torrent already in the queue: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068
+#, java-format
+msgid "Torrent at {0} was not valid"
+msgstr ""
+
+#. FIXME don't lose peer setting
+#. String peerParam = req.getParameter("p");
+#. if (peerParam != null)
+#. buf.append("<input type=\"hidden\" name=\"p\" value=\"").append(peerParam).append("\" >\n");
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082
+#, java-format
+msgid "Torrent was not retrieved from {0}"
+msgstr ""
--- a/apps/i2psnark/locale/messages_de.po
+++ b/apps/i2psnark/locale/messages_de.po
--- a/apps/i2psnark/locale/messages_en.po
+++ b/apps/i2psnark/locale/messages_en.po
--- a/apps/i2psnark/locale/messages_es.po
+++ b/apps/i2psnark/locale/messages_es.po
--- a/apps/i2psnark/locale/messages_fr.po
+++ b/apps/i2psnark/locale/messages_fr.po
@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P i2psnark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-25 12:48+0000\n"
-"PO-Revision-Date: 2011-04-11 15:45+0100\n"
+"POT-Creation-Date: 2011-07-08 13:20+0000\n"
+"PO-Revision-Date: 2011-05-19 07:39+0100\n"
 "Last-Translator: magma <magma@mail.i2p>\n"
 "Language-Team: foo <foo@bar>\n"
 "Language: \n"
@ -46,7 +46,9 @@ msgstr "Délai de démarrage modifié à {0} minutes"

 #: ../java/src/org/klomp/snark/SnarkManager.java:386
 msgid "I2CP and tunnel changes will take effect after stopping all torrents"
-msgstr "Les modifications d'I2CP et des tunnels seront prise en compte après avoir arrêté tous les torrents"
+msgstr ""
+"Les modifications d'I2CP et des tunnels seront prise en compte après avoir "
+"arrêté tous les torrents"

 #: ../java/src/org/klomp/snark/SnarkManager.java:393
 msgid "Disconnecting old I2CP destination"
@ -58,8 +60,11 @@ msgid "I2CP settings changed to {0}"
 msgstr "Les paramètres I2CP ont été changés : {0}"

 #: ../java/src/org/klomp/snark/SnarkManager.java:402
-msgid "Unable to connect with the new settings, reverting to the old I2CP settings"
-msgstr "Impossible de se connecter avec les nouveaux paramètres, retour à l'ancienne configuration I2CP"
+msgid ""
+"Unable to connect with the new settings, reverting to the old I2CP settings"
+msgstr ""
+"Impossible de se connecter avec les nouveaux paramètres, retour à l'ancienne "
+"configuration I2CP"

 #: ../java/src/org/klomp/snark/SnarkManager.java:406
 msgid "Unable to reconnect with the old settings!"
@ -84,20 +89,27 @@ msgstr "Démarrage automatique désactivé"

 #: ../java/src/org/klomp/snark/SnarkManager.java:437
 msgid "Enabled open trackers - torrent restart required to take effect."
-msgstr "Open trackers activés - redémarrage des torrents requis pour prise en compte."
+msgstr ""
+"Open trackers activés - redémarrage des torrents requis pour prise en compte."

 #: ../java/src/org/klomp/snark/SnarkManager.java:439
 msgid "Disabled open trackers - torrent restart required to take effect."
-msgstr "Open trackers désactivés - redémarrage des torrents requis pour prise en compte."
+msgstr ""
+"Open trackers désactivés - redémarrage des torrents requis pour prise en "
+"compte."

 #: ../java/src/org/klomp/snark/SnarkManager.java:447
 msgid "Open Tracker list changed - torrent restart required to take effect."
-msgstr "Liste des Open trackers modifiée - redémarrage des torrents requis pour prise en compte"
+msgstr ""
+"Liste des Open trackers modifiée - redémarrage des torrents requis pour "
+"prise en compte"

 #: ../java/src/org/klomp/snark/SnarkManager.java:454
 #, java-format
 msgid "{0} theme loaded, return to main i2psnark page to view."
-msgstr "Thème {0}  chargé, revenez à la page d''accueil d''i2psnark pour voir comme il est beau !"
+msgstr ""
+"Thème {0}  chargé, revenez à la page d''accueil d''i2psnark pour voir comme "
+"il est beau !"

 #: ../java/src/org/klomp/snark/SnarkManager.java:461
 msgid "Configuration unchanged."
@ -131,7 +143,7 @@ msgstr "Impossible d’ouvrir: \"{0}\""
 #: ../java/src/org/klomp/snark/SnarkManager.java:589
 #: ../java/src/org/klomp/snark/SnarkManager.java:665
 #: ../java/src/org/klomp/snark/SnarkManager.java:720
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1976
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1978
 #, java-format
 msgid "Torrent with this info hash is already running: {0}"
 msgstr "Un torrent avec cette empreinte est déjà actif: {0}"
@ -139,14 +151,22 @@ msgstr "Un torrent avec cette empreinte est déjà actif: {0}"
 #. addMessage(_("Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and DHT only.", info.getName()));
 #: ../java/src/org/klomp/snark/SnarkManager.java:596
 #, java-format
-msgid "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers only."
-msgstr "Attention - Les trackers non-i2p dans \"{0}\" sont ignorés, seuls les trackers ouverts I2P seront utilisés!"
+msgid ""
+"Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers "
+"only."
+msgstr ""
+"Attention - Les trackers non-i2p dans \"{0}\" sont ignorés, seuls les "
+"trackers ouverts I2P seront utilisés!"

 #. addMessage(_("Warning - No I2P trackers in \"{0}\", and DHT and open trackers are disabled, you should enable open trackers or DHT before starting the torrent.", info.getName()));
 #: ../java/src/org/klomp/snark/SnarkManager.java:601
 #, java-format
-msgid "Warning - No I2P Trackers found in \"{0}\". Make sure Open Tracker is enabled before starting this torrent."
-msgstr "Attention - aucun tracker i2p dans \"{0}\". Vous devez activer les open trackers avant de démarrer le torrent!"
+msgid ""
+"Warning - No I2P Trackers found in \"{0}\". Make sure Open Tracker is "
+"enabled before starting this torrent."
+msgstr ""
+"Attention - aucun tracker i2p dans \"{0}\". Vous devez activer les open "
+"trackers avant de démarrer le torrent!"

 #: ../java/src/org/klomp/snark/SnarkManager.java:622
 #, java-format
@ -154,7 +174,7 @@ msgid "Torrent in \"{0}\" is invalid"
 msgstr "Le torrent dans \"{0}\" est invalide"

 #: ../java/src/org/klomp/snark/SnarkManager.java:627
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1998
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2000
 #, java-format
 msgid "ERROR - Out of memory, cannot create torrent from {0}"
 msgstr "ERREUR - Mémoire insuffisante, impossible de créer le torrent de {0}"
@ -177,8 +197,12 @@ msgstr "Envoi {0}"

 #: ../java/src/org/klomp/snark/SnarkManager.java:679
 #, java-format
-msgid "We have no saved peers and no other torrents are running. Fetch of {0} will not succeed until you start another torrent."
-msgstr "Aucun pair sauvegardé et aucun autre torrent en cours. Le téléchargement de {0} ne commencera que lorsque vous démarrerez un autre torrent."
+msgid ""
+"We have no saved peers and no other torrents are running. Fetch of {0} will "
+"not succeed until you start another torrent."
+msgstr ""
+"Aucun pair sauvegardé et aucun autre torrent en cours. Le téléchargement de "
+"{0} ne commencera que lorsque vous démarrerez un autre torrent."

 #: ../java/src/org/klomp/snark/SnarkManager.java:683
 #, java-format
@ -187,7 +211,7 @@ msgstr "Ajout {0}"

 #: ../java/src/org/klomp/snark/SnarkManager.java:730
 #: ../java/src/org/klomp/snark/SnarkManager.java:753
-#: ../java/src/org/klomp/snark/SnarkManager.java:1178
+#: ../java/src/org/klomp/snark/SnarkManager.java:1180
 #, java-format
 msgid "Failed to copy torrent file to {0}"
 msgstr "Impossible de copier le torrent vers {0}"
@ -200,7 +224,9 @@ msgstr "Trop de fichiers dans \"{0}\" ({1}), suppression! "
 #: ../java/src/org/klomp/snark/SnarkManager.java:978
 #, java-format
 msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
-msgstr "Le fichier torrent \"{0}\" ne peut pas se terminer par \".torrent\", suppression!"
+msgstr ""
+"Le fichier torrent \"{0}\" ne peut pas se terminer par \".torrent\", "
+"suppression!"

 #: ../java/src/org/klomp/snark/SnarkManager.java:980
 #, java-format
@ -222,53 +248,60 @@ msgstr "Les tronçons sont trop larges dans \"{0}\" ({1}B), suppression."
 msgid "Limit is {0}B"
 msgstr "La limite est de \"{0}\"octets"

-#: ../java/src/org/klomp/snark/SnarkManager.java:993
+#: ../java/src/org/klomp/snark/SnarkManager.java:987
+#, java-format
+msgid "Torrent \"{0}\" has no data, deleting it!"
+msgstr "Le fichier torrent \"{0}\" n'a pas de données, suppression!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:995
 #, java-format
 msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
-msgstr "Les torrents dont la taille est supérieure à \"{0}\"octets ne sont pas encore supportés, suppression \"{1}\"."
+msgstr ""
+"Les torrents dont la taille est supérieure à \"{0}\"octets ne sont pas "
+"encore supportés, suppression \"{1}\"."

-#: ../java/src/org/klomp/snark/SnarkManager.java:1009
+#: ../java/src/org/klomp/snark/SnarkManager.java:1011
 #, java-format
 msgid "Error: Could not remove the torrent {0}"
 msgstr "Erreur: Impossible de supprimer le torrent \"{0}\""

-#: ../java/src/org/klomp/snark/SnarkManager.java:1030
-#: ../java/src/org/klomp/snark/SnarkManager.java:1048
+#: ../java/src/org/klomp/snark/SnarkManager.java:1032
+#: ../java/src/org/klomp/snark/SnarkManager.java:1050
 #, java-format
 msgid "Torrent stopped: \"{0}\""
 msgstr "Torrent arrêté:\"{0}\""

-#: ../java/src/org/klomp/snark/SnarkManager.java:1069
+#: ../java/src/org/klomp/snark/SnarkManager.java:1071
 #, java-format
 msgid "Torrent removed: \"{0}\""
 msgstr "Torrent supprimé:\"{0}\""

-#: ../java/src/org/klomp/snark/SnarkManager.java:1077
+#: ../java/src/org/klomp/snark/SnarkManager.java:1079
 #, java-format
 msgid "Adding torrents in {0}"
 msgstr "Ajout des torrents dans {0}"

-#: ../java/src/org/klomp/snark/SnarkManager.java:1126
+#: ../java/src/org/klomp/snark/SnarkManager.java:1128
 #, java-format
 msgid "Download finished: {0}"
 msgstr "Téléchargement terminé:\"{0}\""

-#: ../java/src/org/klomp/snark/SnarkManager.java:1174
+#: ../java/src/org/klomp/snark/SnarkManager.java:1176
 #, java-format
 msgid "Metainfo received for {0}"
 msgstr "Metainfo reçue pour {0}"

-#: ../java/src/org/klomp/snark/SnarkManager.java:1175
+#: ../java/src/org/klomp/snark/SnarkManager.java:1177
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:526
 #, java-format
 msgid "Starting up torrent {0}"
 msgstr "Démarrage du torrent {0}"

-#: ../java/src/org/klomp/snark/SnarkManager.java:1229
+#: ../java/src/org/klomp/snark/SnarkManager.java:1231
 msgid "Unable to connect to I2P!"
 msgstr "Impossible de se connecter à I2P!"

-#: ../java/src/org/klomp/snark/SnarkManager.java:1235
+#: ../java/src/org/klomp/snark/SnarkManager.java:1237
 #, java-format
 msgid "Unable to add {0}"
 msgstr "Impossible d’ajouter {0}"
@ -296,7 +329,7 @@ msgid "Forum"
 msgstr "Forum"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:284
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1719
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721
 msgid "Status"
 msgstr "État"

@ -311,8 +344,8 @@ msgid "Show Peers"
 msgstr "Afficher les pairs"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:306
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1643
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1659
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1645
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1661
 msgid "Torrent"
 msgstr "Torrent"

@ -402,7 +435,8 @@ msgstr[1] "{0} pairs connectés"
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:497
 #, java-format
 msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\""
-msgstr "URL incorrecte - elle doit débuter par \"http://\", \"{0}\", ou \"{1}\""
+msgstr ""
+"URL incorrecte - elle doit débuter par \"http://\", \"{0}\", ou \"{1}\""

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:545
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:572
@ -435,7 +469,8 @@ msgstr "Répertoire des données effacé: {0}"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:638
 msgid "Error creating torrent - you must select a tracker"
-msgstr "Erreur lors de la création du torrent - vous devez sélectionner un tracker"
+msgstr ""
+"Erreur lors de la création du torrent - vous devez sélectionner un tracker"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:653
 #, java-format
@ -444,8 +479,12 @@ msgstr "Torrent créé pour \"{0}\""

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:655
 #, java-format
-msgid "Many I2P trackers require you to register new torrents before seeding - please do so before starting \"{0}\""
-msgstr "De nombreux trackers I2P nécessitent d’enregistrer les nouveaux torrents avant de seeder - faites-le avant de démarrer \"{0}\"!"
+msgid ""
+"Many I2P trackers require you to register new torrents before seeding - "
+"please do so before starting \"{0}\""
+msgstr ""
+"De nombreux trackers I2P nécessitent d’enregistrer les nouveaux torrents "
+"avant de seeder - faites-le avant de démarrer \"{0}\"!"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:657
 #, java-format
@ -459,7 +498,8 @@ msgstr "Impossible de créer un torrent pour des données inexistantes: {0}"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
 msgid "Error creating torrent - you must enter a file or directory"
-msgstr "Erreur de création du torrent - vous devez saisir un fichier ou un répertoire"
+msgstr ""
+"Erreur de création du torrent - vous devez saisir un fichier ou un répertoire"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:666
 msgid "Stopping all torrents and closing the I2P tunnel."
@ -499,8 +539,8 @@ msgid "Seeding"
 msgstr "Seed en cours"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:828
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1665
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1770
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1667
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1772
 msgid "Complete"
 msgstr "Complet"

@ -528,7 +568,7 @@ msgid "Torrent details"
 msgstr "Détails du torrent"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:898
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1160
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1162
 msgid "Info"
 msgstr "Info"

@ -565,8 +605,12 @@ msgstr "Enlever le torrent de la liste active, suprression du fichier .torrent"
 #. Then the remaining single quite must be escaped
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:987
 #, java-format
-msgid "Are you sure you want to delete the file \\''{0}.torrent\\'' (downloaded data will not be deleted) ?"
-msgstr "Êtes-vous certain de vouloir supprimer le fichier  \\''{0}.torrent\\'' (les données déjà téléchargées ne seront pas supprimées) ?"
+msgid ""
+"Are you sure you want to delete the file \\''{0}.torrent\\'' (downloaded "
+"data will not be deleted) ?"
+msgstr ""
+"Êtes-vous certain de vouloir supprimer le fichier  \\''{0}.torrent\\'' (les "
+"données déjà téléchargées ne seront pas supprimées) ?"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:990
 msgid "Remove"
@ -574,370 +618,402 @@ msgstr "Enlever"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1001
 msgid "Delete the .torrent file and the associated data file(s)"
-msgstr "Supprimer le fichier .torrent et le(s) fichier(s) de données associé(s)"
+msgstr ""
+"Supprimer le fichier .torrent et le(s) fichier(s) de données associé(s)"

 #. Can't figure out how to escape double quotes inside the onclick string.
 #. Single quotes in translate strings with parameters must be doubled.
 #. Then the remaining single quite must be escaped
 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1006
 #, java-format
-msgid "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded data?"
-msgstr "Êtes-vous certain de vouloir supprimer le torrent \\''{0}\\'' ainsi que toutes les données téléchargées ?"
+msgid ""
+"Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded "
+"data?"
+msgstr ""
+"Êtes-vous certain de vouloir supprimer le torrent \\''{0}\\'' ainsi que "
+"toutes les données téléchargées ?"

 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1009
 msgid "Delete"
 msgstr "Supprimer"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1042
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1044
 msgid "Unknown"
 msgstr "Inconnu"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1054
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1056
 msgid "Seed"
 msgstr "Seed"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1077
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1079
 msgid "Uninteresting (The peer has no pieces we need)"
 msgstr "Aucun intérêt (le pair n'a aucun tronçon utile)"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1079
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1081
 msgid "Choked (The peer is not allowing us to request pieces)"
 msgstr "bridé (le pair ne nous permet pas de demander des tronçons)"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1099
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1101
 msgid "Uninterested (We have no pieces the peer needs)"
 msgstr "Pas intéressé (aucun tronçon utile au pair)"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1101
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1103
 msgid "Choking (We are not allowing the peer to request pieces)"
 msgstr "bridage (nous ne permettons pas au pair de demander un tronçon)"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1159
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1161
 #, java-format
 msgid "Details at {0} tracker"
 msgstr "Détails au tracker {0}"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1188
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1190
 msgid "Add Torrent"
 msgstr "Ajouter torrent"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1190
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1192
 msgid "From URL"
 msgstr "Depuis l'URL"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1193
-msgid "Enter the torrent file download URL (I2P only), magnet link, or maggot link"
-msgstr "Entrez l'URL (I2P uniquement) de téléchargement du fichier torrent, du lien magnet ou maggot."
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1195
+msgid ""
+"Enter the torrent file download URL (I2P only), magnet link, or maggot link"
+msgstr ""
+"Entrez l'URL (I2P uniquement) de téléchargement du fichier torrent, du lien "
+"magnet ou maggot."

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1198
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1200
 msgid "Add torrent"
 msgstr "Ajouter torrent"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1201
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1203
 #, java-format
 msgid "You can also copy .torrent files to: {0}."
 msgstr "Vous pouvez aussi copier les fichiers .torrent vers {0}."

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1203
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1205
 msgid "Removing a .torrent will cause it to stop."
 msgstr "La suppression d'un fichier .torrent entraîne l'arrêt du torrent."

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1226
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1228
 msgid "Create Torrent"
 msgstr "Créer torrent"

 #. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\" value=\"" + newFile + "\" /><br>\n");
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231
 msgid "Data to seed"
 msgstr "Données à seeder"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1235
 msgid "File or directory to seed (must be within the specified path)"
 msgstr "Fichier ou répertoire à seeder (doit être dans le chemin spécifié)"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1235
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686
 msgid "Tracker"
 msgstr "Tracker"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1239
 msgid "Select a tracker"
 msgstr "Sélectionner un tracker"

 #. out.write(_("Open trackers and DHT only"));
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1242
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1244
 msgid "Open trackers only"
 msgstr "Trackers ouverts seulement"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1257
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1259
 msgid "or"
 msgstr "ou"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1260
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1262
 msgid "Specify custom tracker announce URL"
 msgstr "Spécifier une URL d'annonce de tracker personnalisé"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1263
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1265
 msgid "Create torrent"
 msgstr "Créer torrent"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1281
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1420
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1283
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1422
 msgid "Configuration"
 msgstr "Configuration"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1285
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1287
 msgid "Data directory"
 msgstr "Répertoire de données"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1287
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1289
 msgid "Edit i2psnark.config and restart to change"
-msgstr "Editez i2psnark.config et redémarrez pour prendre en compte les modifications"
+msgstr ""
+"Editez i2psnark.config et redémarrez pour prendre en compte les modifications"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1291
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1293
 msgid "Auto start"
 msgstr "Démarrage automatique"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1297
 msgid "If checked, automatically start torrents that are added"
 msgstr "Si coché, les torrents démarreront automatiquement lors de l'ajout"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1299
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1301
 msgid "Theme"
 msgstr "Thème"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1312
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1314
 msgid "Startup delay"
 msgstr "Délais de démarrage"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1314
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1316
 msgid "minutes"
 msgstr "minutes"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1338
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1340
 msgid "Total uploader limit"
 msgstr "Limite totale d'envoi"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1341
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343
 msgid "peers"
 msgstr "pairs"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1345
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1347
 msgid "Up bandwidth limit"
 msgstr "Limite de bande passante en envoi"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1350
 msgid "Half available bandwidth recommended."
 msgstr "La moitié de la bande passante est recommandée."

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1350
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1352
 msgid "View or change router bandwidth"
 msgstr "Consulter ou modifier la bande passante du routeur"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1354
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1356
 msgid "Use open trackers also"
 msgstr "Utiliser les open trackers aussi"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1358
-msgid "If checked, announce torrents to open trackers as well as the tracker listed in the torrent file"
-msgstr "Si coché, les torrents seront annoncés vers les open trackers ainsi que vers les trackers indiqués dans le fichier torrent"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1360
+msgid ""
+"If checked, announce torrents to open trackers as well as the tracker listed "
+"in the torrent file"
+msgstr ""
+"Si coché, les torrents seront annoncés vers les open trackers ainsi que vers "
+"les trackers indiqués dans le fichier torrent"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1362
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364
 msgid "Open tracker announce URLs"
 msgstr "URLs d'annonce open tracker"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1374
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1376
 msgid "Inbound Settings"
 msgstr "Paramètres entrants"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1380
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1382
 msgid "Outbound Settings"
 msgstr "Paramètres sortants"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1388
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1390
 msgid "I2CP host"
 msgstr "Hôte I2CP"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1393
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1395
 msgid "I2CP port"
 msgstr "Port I2CP"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1406
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1408
 msgid "I2CP options"
 msgstr "Options I2CP"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1411
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1413
 msgid "Save configuration"
 msgstr "Sauvegarder la configuration"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1436
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1438
 #, java-format
 msgid "Invalid magnet URL {0}"
 msgstr "URL magnet {0} incorrecte"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1470
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1472
 #, java-format
 msgid "Invalid info hash in magnet URL {0}"
 msgstr "Info d'empreinte incorrecte dans l'URL magnet {0}"

 #. * dummies for translation
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1500
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502
 #, java-format
 msgid "1 hop"
 msgid_plural "{0} hops"
 msgstr[0] "{0} saut"
 msgstr[1] "{0} sauts"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1501
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1503
 #, java-format
 msgid "1 tunnel"
 msgid_plural "{0} tunnels"
 msgstr[0] "{0} tunnel"
 msgstr[1] "{0} tunnels"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1665
 msgid "Completion"
 msgstr "Finalisation"

 #. else unknown
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1667
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1716
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1718
 msgid "Size"
 msgstr "Taille"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1672
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1674
 msgid "Files"
 msgstr "Fichiers"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1674
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1676
 msgid "Pieces"
 msgstr "Tronçons"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1675
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1677
 msgid "Piece size"
 msgstr "Taille des tronçons"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1697
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699
 msgid "Magnet link"
 msgstr "Lien magnet"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1714
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1753
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1716
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1755
 msgid "Directory"
 msgstr "Répertoire"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1723
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1725
 msgid "Priority"
 msgstr "Priorité"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1728
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730
 msgid "Up to higher level directory"
 msgstr "Vers le répertoire parent"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1758
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1760
 msgid "Torrent not found?"
 msgstr "Torrent non trouvé?"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1767
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1769
 msgid "File not found in torrent?"
 msgstr "Fichier non trouvé dans le torrent?"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1780
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1782
 msgid "complete"
 msgstr "complet"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1781
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1783
 msgid "bytes remaining"
 msgstr "Octets restants"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1806
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1808
 msgid "Open"
 msgstr "Ouvrir le fichier"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1832
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1834
 msgid "High"
 msgstr "Haut"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1837
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1839
 msgid "Normal"
 msgstr "Normal"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1842
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1844
 msgid "Skip"
 msgstr "Ignorer"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1851
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1853
 msgid "Save priorities"
 msgstr "Sauvegarder les priorités"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1967
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1969
 #, java-format
 msgid "Torrent fetched from {0}"
 msgstr "Torrent reçu de {0}"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1988
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1990
 #, java-format
 msgid "Torrent already running: {0}"
 msgstr "Torrent déjà actif: {0}"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1990
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1992
 #, java-format
 msgid "Torrent already in the queue: {0}"
 msgstr "Torrent déjà dans la file d''attente: {0}"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1996
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1998
 #, java-format
 msgid "Torrent at {0} was not valid"
 msgstr "Le torrent {0} est invalide"

-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2003
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2005
 #, java-format
 msgid "Torrent was not retrieved from {0}"
 msgstr "Le torrent n’a pas été reçu de {0}"

 #~ msgid "Torrent file must originate from an I2P-based tracker"
 #~ msgstr "Le fichier torrent doit provenir d'un tracker I2P"
+
 #~ msgid "size: {0}B"
 #~ msgstr "Taille: {0}Octets"
+
 #~ msgid "Estimated Download Time"
 #~ msgstr "Temps estimé de téléchargement"
+
 #~ msgid "Torrent file {0} does not exist"
 #~ msgstr "Le fichier torrent {0} n'existe pas"
+
 #~ msgid "Copying torrent to {0}"
 #~ msgstr "Copie du torrent vers {0}"
+
 #~ msgid "from {0}"
 #~ msgstr "depuis {0}"
+
 #~ msgid "Downloading"
 #~ msgstr "Téléchargement en cours"
+
 #~ msgid "FileSize"
 #~ msgstr "Taille du fichier"
+
 #~ msgid "Download Status"
 #~ msgstr "État du téléchargement"
+
 #~ msgid "Details"
 #~ msgstr "Détails"
+
 #~ msgid "Depuis l'URL"
 #~ msgstr "Quell-URL"
+
 #~ msgid "Directory to store torrents and data"
 #~ msgstr "Répertoire de stockage des torrents et des données"
+
 #~ msgid "Cannot change the I2CP settings while torrents are active"
 #~ msgstr ""
 #~ "On ne peut changer les paramètres I2CP pendant que des torrents sont "
 #~ "actifs"
+
 #~ msgid "Non-i2p tracker in \"{0}\", deleting it from our list of trackers!"
 #~ msgstr ""
 #~ "Tracker non-i2p dans \"{0}\", suppression de notre liste de trackers!"
+
 #~ msgid "{0} torrents"
 #~ msgstr "{0} Torrents"
+
 #~ msgid "Uninteresting"
 #~ msgstr "Pas intéressant"
+
 #~ msgid "Choked"
 #~ msgstr "Choked"
+
 #~ msgid "Uninterested"
 #~ msgstr "Pas interessé"
+
 #~ msgid "Choking"
 #~ msgstr "Choking"
+
 #~ msgid "Custom tracker URL"
 #~ msgstr "URL tracker spécifique"
+
 #~ msgid "Configure"
 #~ msgstr "Configurer"
-
--- a/apps/i2psnark/locale/messages_it.po
+++ b/apps/i2psnark/locale/messages_it.po
@ -0,0 +1,951 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2psnark package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-09-23 19:47+0000\n"
+"PO-Revision-Date: 2011-06-11 09:17+0000\n"
+"Last-Translator: duck <duck@mail.i2p>\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/I2P/team/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/src/org/klomp/snark/SnarkManager.java:355
+#, java-format
+msgid "Total uploaders limit changed to {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:357
+#, java-format
+msgid "Minimum total uploaders limit is {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:369
+#, java-format
+msgid "Up BW limit changed to {0}KBps"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:371
+#, java-format
+msgid "Minimum up bandwidth limit is {0}KBps"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:383
+#, java-format
+msgid "Startup delay changed to {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:394
+#, java-format
+msgid "Refresh time changed to {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:396
+msgid "Refresh disabled"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:451
+msgid "I2CP and tunnel changes will take effect after stopping all torrents"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:455
+#, java-format
+msgid "I2CP options changed to {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:460
+msgid "Disconnecting old I2CP destination"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:462
+#, java-format
+msgid "I2CP settings changed to {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:467
+msgid ""
+"Unable to connect with the new settings, reverting to the old I2CP settings"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:471
+msgid "Unable to reconnect with the old settings!"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:473
+msgid "Reconnected on the new I2CP destination"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:480
+#, java-format
+msgid "I2CP listener restarted for \"{0}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:492
+msgid "New files will be publicly readable"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:494
+msgid "New files will not be publicly readable"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:501
+msgid "Enabled autostart"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:503
+msgid "Disabled autostart"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:509
+msgid "Enabled open trackers - torrent restart required to take effect."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:511
+msgid "Disabled open trackers - torrent restart required to take effect."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:519
+msgid "Open Tracker list changed - torrent restart required to take effect."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:526
+#, java-format
+msgid "{0} theme loaded, return to main i2psnark page to view."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:533
+msgid "Configuration unchanged."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:543
+#, java-format
+msgid "Unable to save the config to {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:608
+msgid "Connecting to I2P"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:611
+msgid "Error connecting to I2P - check your I2CP settings!"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:620
+#, java-format
+msgid "Error: Could not add the torrent {0}"
+msgstr ""
+
+#. catch this here so we don't try do delete it below
+#: ../java/src/org/klomp/snark/SnarkManager.java:642
+#, java-format
+msgid "Cannot open \"{0}\""
+msgstr ""
+
+#. TODO - if the existing one is a magnet, delete it and add the metainfo instead?
+#: ../java/src/org/klomp/snark/SnarkManager.java:661
+#: ../java/src/org/klomp/snark/SnarkManager.java:737
+#: ../java/src/org/klomp/snark/SnarkManager.java:792
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2015
+#, java-format
+msgid "Torrent with this info hash is already running: {0}"
+msgstr ""
+
+#. addMessage(_("Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and DHT only.", info.getName()));
+#: ../java/src/org/klomp/snark/SnarkManager.java:668
+#, java-format
+msgid ""
+"Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers "
+"only."
+msgstr ""
+
+#. addMessage(_("Warning - No I2P trackers in \"{0}\", and DHT and open trackers are disabled, you should enable open trackers or DHT before starting the torrent.", info.getName()));
+#: ../java/src/org/klomp/snark/SnarkManager.java:673
+#, java-format
+msgid ""
+"Warning - No I2P Trackers found in \"{0}\". Make sure Open Tracker is "
+"enabled before starting this torrent."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:694
+#, java-format
+msgid "Torrent in \"{0}\" is invalid"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:699
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037
+#, java-format
+msgid "ERROR - Out of memory, cannot create torrent from {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:711
+#, java-format
+msgid "Torrent added and started: \"{0}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:713
+#, java-format
+msgid "Torrent added: \"{0}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:748
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493
+#, java-format
+msgid "Fetching {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:751
+#, java-format
+msgid ""
+"We have no saved peers and no other torrents are running. Fetch of {0} will "
+"not succeed until you start another torrent."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:755
+#, java-format
+msgid "Adding {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:802
+#: ../java/src/org/klomp/snark/SnarkManager.java:825
+#: ../java/src/org/klomp/snark/SnarkManager.java:1260
+#, java-format
+msgid "Failed to copy torrent file to {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1052
+#, java-format
+msgid "Too many files in \"{0}\" ({1}), deleting it!"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1054
+#, java-format
+msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1056
+#, java-format
+msgid "No pieces in \"{0}\",  deleting it!"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1058
+#, java-format
+msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1060
+#, java-format
+msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1061
+#, java-format
+msgid "Limit is {0}B"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1063
+#, java-format
+msgid "Torrent \"{0}\" has no data, deleting it!"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1071
+#, java-format
+msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1087
+#, java-format
+msgid "Error: Could not remove the torrent {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1108
+#: ../java/src/org/klomp/snark/SnarkManager.java:1126
+#, java-format
+msgid "Torrent stopped: \"{0}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1147
+#, java-format
+msgid "Torrent removed: \"{0}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1155
+#, java-format
+msgid "Adding torrents in {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1208
+#, java-format
+msgid "Download finished: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1256
+#, java-format
+msgid "Metainfo received for {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1257
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:528
+#, java-format
+msgid "Starting up torrent {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1313
+msgid "Unable to connect to I2P!"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1319
+#, java-format
+msgid "Unable to add {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:204
+msgid "I2PSnark - Anonymous BitTorrent Client"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:220
+msgid "Torrents"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:223
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:230
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1033
+msgid "I2PSnark"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:227
+msgid "Refresh page"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:232
+msgid "Forum"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:286
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1758
+msgid "Status"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:292
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:294
+msgid "Hide Peers"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:299
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:301
+msgid "Show Peers"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:308
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1682
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1698
+msgid "Torrent"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:312
+msgid "Estimated time remaining"
+msgstr ""
+
+#. Translators: Please keep short or translate as " "
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:315
+msgid "ETA"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:319
+msgid "Downloaded"
+msgstr ""
+
+#. Translators: Please keep short or translate as " "
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:336
+msgid "RX"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:326
+msgid "Uploaded"
+msgstr ""
+
+#. Translators: Please keep short or translate as " "
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:329
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:346
+msgid "TX"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:334
+msgid "Down Rate"
+msgstr ""
+
+#. Translators: Please keep short or translate as " "
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:339
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:348
+msgid "Rate"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:344
+msgid "Up Rate"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:368
+msgid "Stop all torrents and the I2P tunnel"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:370
+msgid "Stop All"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:379
+msgid "Start all torrents and the I2P tunnel"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:381
+msgid "Start All"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:400
+msgid "No torrents loaded."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:405
+msgid "Totals"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:407
+#, java-format
+msgid "1 torrent"
+msgid_plural "{0} torrents"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:410
+#, java-format
+msgid "1 connected peer"
+msgid_plural "{0} connected peers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:499
+#, java-format
+msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:547
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:574
+#, java-format
+msgid "Magnet deleted: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:555
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580
+#, java-format
+msgid "Torrent file deleted: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:586
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596
+#, java-format
+msgid "Data file deleted: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:588
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598
+#, java-format
+msgid "Data file could not be deleted: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:607
+#, java-format
+msgid "Data dir deleted: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644
+msgid "Error creating torrent - you must select a tracker"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:659
+#, java-format
+msgid "Torrent created for \"{0}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:661
+#, java-format
+msgid ""
+"Many I2P trackers require you to register new torrents before seeding - "
+"please do so before starting \"{0}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#, java-format
+msgid "Error creating a torrent for \"{0}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:666
+#, java-format
+msgid "Cannot create a torrent for the nonexistent data: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:669
+msgid "Error creating torrent - you must enter a file or directory"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:672
+msgid "Stopping all torrents and closing the I2P tunnel."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:683
+msgid "I2P tunnel closed."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:686
+msgid "Opening the I2P tunnel and starting all torrents."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:808
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:813
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:819
+msgid "Tracker Error"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:815
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:827
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:831
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:839
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:843
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:848
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:852
+#, java-format
+msgid "1 peer"
+msgid_plural "{0} peers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:824
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:829
+msgid "Seeding"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1809
+msgid "Complete"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:836
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:841
+msgid "OK"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:845
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:850
+msgid "Stalled"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:857
+msgid "No Peers"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:859
+msgid "Stopped"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:891
+msgid "Torrent details"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:903
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1167
+msgid "Info"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:918
+msgid "View files"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:920
+msgid "Open file"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:962
+msgid "Stop the torrent"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:964
+msgid "Stop"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:974
+msgid "Start the torrent"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:976
+msgid "Start"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:987
+msgid "Remove the torrent from the active list, deleting the .torrent file"
+msgstr ""
+
+#. Can't figure out how to escape double quotes inside the onclick string.
+#. Single quotes in translate strings with parameters must be doubled.
+#. Then the remaining single quite must be escaped
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:992
+#, java-format
+msgid ""
+"Are you sure you want to delete the file \\''{0}.torrent\\'' (downloaded "
+"data will not be deleted) ?"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:995
+msgid "Remove"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1006
+msgid "Delete the .torrent file and the associated data file(s)"
+msgstr ""
+
+#. Can't figure out how to escape double quotes inside the onclick string.
+#. Single quotes in translate strings with parameters must be doubled.
+#. Then the remaining single quite must be escaped
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1011
+#, java-format
+msgid ""
+"Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded "
+"data?"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014
+msgid "Delete"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049
+msgid "Unknown"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1061
+msgid "Seed"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084
+msgid "Uninteresting (The peer has no pieces we need)"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1086
+msgid "Choked (The peer is not allowing us to request pieces)"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1106
+msgid "Uninterested (We have no pieces the peer needs)"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1108
+msgid "Choking (We are not allowing the peer to request pieces)"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166
+#, java-format
+msgid "Details at {0} tracker"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1195
+msgid "Add Torrent"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1197
+msgid "From URL"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1200
+msgid ""
+"Enter the torrent file download URL (I2P only), magnet link, or maggot link"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1205
+msgid "Add torrent"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1208
+#, java-format
+msgid "You can also copy .torrent files to: {0}."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1210
+msgid "Removing a .torrent will cause it to stop."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233
+msgid "Create Torrent"
+msgstr ""
+
+#. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\" value=\"" + newFile + "\" /><br>\n");
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1236
+msgid "Data to seed"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240
+msgid "File or directory to seed (must be within the specified path)"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1242
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1723
+msgid "Tracker"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1244
+msgid "Select a tracker"
+msgstr ""
+
+#. out.write(_("Open trackers and DHT only"));
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1249
+msgid "Open trackers only"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1264
+msgid "or"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1267
+msgid "Specify custom tracker announce URL"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1270
+msgid "Create torrent"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1291
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459
+msgid "Configuration"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295
+msgid "Data directory"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1297
+msgid "Edit i2psnark.config and restart to change"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1301
+msgid "Files readable by all"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1305
+msgid "If checked, other users may access the downloaded files"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1309
+msgid "Auto start"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1313
+msgid "If checked, automatically start torrents that are added"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1317
+msgid "Theme"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1330
+msgid "Refresh time"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343
+msgid "Never"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1349
+msgid "Startup delay"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351
+msgid "minutes"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1375
+msgid "Total uploader limit"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1378
+msgid "peers"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1382
+msgid "Up bandwidth limit"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1385
+msgid "Half available bandwidth recommended."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1387
+msgid "View or change router bandwidth"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1391
+msgid "Use open trackers also"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1395
+msgid ""
+"If checked, announce torrents to open trackers as well as the tracker listed "
+"in the torrent file"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1399
+msgid "Open tracker announce URLs"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1411
+msgid "Inbound Settings"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1417
+msgid "Outbound Settings"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1425
+msgid "I2CP host"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1430
+msgid "I2CP port"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1445
+msgid "I2CP options"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1450
+msgid "Save configuration"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1475
+#, java-format
+msgid "Invalid magnet URL {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509
+#, java-format
+msgid "Invalid info hash in magnet URL {0}"
+msgstr ""
+
+#. * dummies for translation
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539
+#, java-format
+msgid "1 hop"
+msgid_plural "{0} hops"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540
+#, java-format
+msgid "1 tunnel"
+msgid_plural "{0} tunnels"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1702
+msgid "Completion"
+msgstr ""
+
+#. else unknown
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1706
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1755
+msgid "Size"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1711
+msgid "Files"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1713
+msgid "Pieces"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1714
+msgid "Piece size"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1736
+msgid "Magnet link"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1753
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1792
+msgid "Directory"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1762
+msgid "Priority"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1767
+msgid "Up to higher level directory"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1797
+msgid "Torrent not found?"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1806
+msgid "File not found in torrent?"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1819
+msgid "complete"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1820
+msgid "bytes remaining"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1845
+msgid "Open"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1871
+msgid "High"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1876
+msgid "Normal"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1881
+msgid "Skip"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1890
+msgid "Save priorities"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2006
+#, java-format
+msgid "Torrent fetched from {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2027
+#, java-format
+msgid "Torrent already running: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2029
+#, java-format
+msgid "Torrent already in the queue: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2035
+#, java-format
+msgid "Torrent at {0} was not valid"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042
+#, java-format
+msgid "Torrent was not retrieved from {0}"
+msgstr ""
--- a/apps/i2psnark/locale/messages_pl.po
+++ b/apps/i2psnark/locale/messages_pl.po
@ -0,0 +1,995 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2psnark package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+#
+# Translators:
+#   <b790979@klzlk.com>, 2011.
+#   <businesshehe@yahoo.com>, 2012.
+# foo <foo@bar>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-02-02 22:40+0000\n"
+"PO-Revision-Date: 2012-01-20 23:39+0000\n"
+"Last-Translator: Warton <businesshehe@yahoo.com>\n"
+"Language-Team: Polish (http://www.transifex.net/projects/p/I2P/team/pl/)\n"
+"Language: pl\n"
+"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/src/org/klomp/snark/SnarkManager.java:355
+#, java-format
+msgid "Total uploaders limit changed to {0}"
+msgstr "Ograniczenie liczby uploaderów zmieniono do {0}"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:357
+#, java-format
+msgid "Minimum total uploaders limit is {0}"
+msgstr "Minimalny całkowity limit uploadera: {0}"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:369
+#, java-format
+msgid "Up BW limit changed to {0}KBps"
+msgstr "Ograniczenie pasma WY zmieniono na: {0} KB/s"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:371
+#, java-format
+msgid "Minimum up bandwidth limit is {0}KBps"
+msgstr "Minimalne pasmo WY to: {0} KB/s"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:383
+#, java-format
+msgid "Startup delay changed to {0}"
+msgstr "Opóźnienia startu zmieniono na {0}"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:394
+#, java-format
+msgid "Refresh time changed to {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:396
+msgid "Refresh disabled"
+msgstr "Odświeżanie wyłączone"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:451
+msgid "I2CP and tunnel changes will take effect after stopping all torrents"
+msgstr ""
+"Zmiany dotyczące I2CP i tuneli będą wprowadzone po zatrzymaniu wszystkich "
+"torrentów."
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:455
+#, java-format
+msgid "I2CP options changed to {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:460
+msgid "Disconnecting old I2CP destination"
+msgstr "Rozłączanie starych celów I2CP"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:462
+#, java-format
+msgid "I2CP settings changed to {0}"
+msgstr "Ustawienia I2CP zmienione do: {0}"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:467
+msgid ""
+"Unable to connect with the new settings, reverting to the old I2CP settings"
+msgstr ""
+"Nie można połączyć się z nowymi ustawieniami, powrót do starych ustawień I2CP"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:471
+msgid "Unable to reconnect with the old settings!"
+msgstr "Nie można się połączyć ze starymi ustawieniami!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:473
+msgid "Reconnected on the new I2CP destination"
+msgstr "Ponowne podłączanie do nowych celów I2CP"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:480
+#, java-format
+msgid "I2CP listener restarted for \"{0}\""
+msgstr "Nasłuch I2CP zrestartowany dla \"{0}\""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:492
+msgid "New files will be publicly readable"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:494
+msgid "New files will not be publicly readable"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:501
+msgid "Enabled autostart"
+msgstr "Włącz automatycznie uruchamianie"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:503
+msgid "Disabled autostart"
+msgstr "Wyłącz automatycznie uruchamianie"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:509
+msgid "Enabled open trackers - torrent restart required to take effect."
+msgstr "Włączono otwarte trackery - wymagane ponowne uruchomienie torrenta."
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:511
+msgid "Disabled open trackers - torrent restart required to take effect."
+msgstr "Wyłączono otwarte trackery - wymagane ponowne uruchomienie torrenta."
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:519
+msgid "Open Tracker list changed - torrent restart required to take effect."
+msgstr ""
+"Zmieniła się lista otwartych trackerów - wymagane ponowne uruchomienie "
+"torrenta."
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:526
+#, java-format
+msgid "{0} theme loaded, return to main i2psnark page to view."
+msgstr "{0} temat załadowany, powrót do strony głównej i2psnark by zobaczyć."
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:533
+msgid "Configuration unchanged."
+msgstr "Ustawienia niezmienione."
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:543
+#, java-format
+msgid "Unable to save the config to {0}"
+msgstr "Nie można zapisać konfiguracji do {0}"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:608
+msgid "Connecting to I2P"
+msgstr "Łączenie z I2P"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:611
+msgid "Error connecting to I2P - check your I2CP settings!"
+msgstr "Nie można się połączyć z I2P, sprawdź swoje ustawienia I2CP!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:620
+#, java-format
+msgid "Error: Could not add the torrent {0}"
+msgstr "Błąd: Nie można dodać torrenta {0}"
+
+#. catch this here so we don't try do delete it below
+#: ../java/src/org/klomp/snark/SnarkManager.java:642
+#, java-format
+msgid "Cannot open \"{0}\""
+msgstr "Nie można otworzyć \"{0}\""
+
+#. TODO - if the existing one is a magnet, delete it and add the metainfo instead?
+#: ../java/src/org/klomp/snark/SnarkManager.java:661
+#: ../java/src/org/klomp/snark/SnarkManager.java:737
+#: ../java/src/org/klomp/snark/SnarkManager.java:792
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2036
+#, java-format
+msgid "Torrent with this info hash is already running: {0}"
+msgstr ""
+
+#. addMessage(_("Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and DHT only.", info.getName()));
+#: ../java/src/org/klomp/snark/SnarkManager.java:668
+#, java-format
+msgid ""
+"Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers "
+"only."
+msgstr ""
+
+#. addMessage(_("Warning - No I2P trackers in \"{0}\", and DHT and open trackers are disabled, you should enable open trackers or DHT before starting the torrent.", info.getName()));
+#: ../java/src/org/klomp/snark/SnarkManager.java:673
+#, java-format
+msgid ""
+"Warning - No I2P Trackers found in \"{0}\". Make sure Open Tracker is "
+"enabled before starting this torrent."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:694
+#, java-format
+msgid "Torrent in \"{0}\" is invalid"
+msgstr "Torrent w \"{0}\" jest niepoprawny"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:699
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2058
+#, java-format
+msgid "ERROR - Out of memory, cannot create torrent from {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:711
+#, java-format
+msgid "Torrent added and started: \"{0}\""
+msgstr "Torrent dodany i uruchomiony: \"{0}\""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:713
+#, java-format
+msgid "Torrent added: \"{0}\""
+msgstr "Torrent dodany: \"{0}\""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:748
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:499
+#, java-format
+msgid "Fetching {0}"
+msgstr "Pobieranie: {0}"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:751
+#, java-format
+msgid ""
+"We have no saved peers and no other torrents are running. Fetch of {0} will "
+"not succeed until you start another torrent."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:755
+#, java-format
+msgid "Adding {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:802
+#: ../java/src/org/klomp/snark/SnarkManager.java:825
+#: ../java/src/org/klomp/snark/SnarkManager.java:1260
+#, java-format
+msgid "Failed to copy torrent file to {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1052
+#, java-format
+msgid "Too many files in \"{0}\" ({1}), deleting it!"
+msgstr "Za dużo plików w \"{0}\" ({1}), usuwanie go!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1054
+#, java-format
+msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
+msgstr "Torrent \"{0}\" nie może się kończyć w \".torrent\", usuwanie go!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1056
+#, java-format
+msgid "No pieces in \"{0}\",  deleting it!"
+msgstr "W torrencie \"{0}\" nie ma piece'ów, usuwanie go!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1058
+#, java-format
+msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
+msgstr "Za dużo piece''ów w \"{0}\" (limit to {1}), usuwanie go!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1060
+#, java-format
+msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
+msgstr "Za duże piece''y w torrencie \"{0}\" ({1}B), usuwanie go."
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1061
+#, java-format
+msgid "Limit is {0}B"
+msgstr "Granica to {0}B"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1063
+#, java-format
+msgid "Torrent \"{0}\" has no data, deleting it!"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1071
+#, java-format
+msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
+msgstr "Torrenty większe niż {0}B nie są jeszcze wspierane, usunięcie \"{1}\""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1087
+#, java-format
+msgid "Error: Could not remove the torrent {0}"
+msgstr "Błąd: nie można usunąć torrenta {0}"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1108
+#: ../java/src/org/klomp/snark/SnarkManager.java:1126
+#, java-format
+msgid "Torrent stopped: \"{0}\""
+msgstr "Torrent zatrzymany: \"{0}\""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1147
+#, java-format
+msgid "Torrent removed: \"{0}\""
+msgstr "Torrent usunięty: \"{0}\""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1155
+#, java-format
+msgid "Adding torrents in {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1208
+#, java-format
+msgid "Download finished: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1256
+#, java-format
+msgid "Metainfo received for {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1257
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534
+#, java-format
+msgid "Starting up torrent {0}"
+msgstr "Uruchamianie torrenta: {0}"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1313
+msgid "Unable to connect to I2P!"
+msgstr "Nie można podłączyć się do I2P!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1319
+#, java-format
+msgid "Unable to add {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:205
+msgid "I2PSnark - Anonymous BitTorrent Client"
+msgstr "I2PSnark – anonimowy klient BitTorrent"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:221
+msgid "Torrents"
+msgstr "Torrenty"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:224
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:231
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1052
+msgid "I2PSnark"
+msgstr "I2PSnark"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:228
+msgid "Refresh page"
+msgstr "Odśwież stronę"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:233
+msgid "Forum"
+msgstr "Forum"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:251
+msgid "Click \"Add torrent\" button to fetch torrent"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:290
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1779
+msgid "Status"
+msgstr "Status"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:296
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:298
+msgid "Hide Peers"
+msgstr "Ukryj peery"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:303
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:305
+msgid "Show Peers"
+msgstr "Pokaż peery"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:312
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1702
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1718
+msgid "Torrent"
+msgstr "Torrent"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:316
+msgid "Estimated time remaining"
+msgstr ""
+
+#. Translators: Please keep short or translate as " "
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:319
+msgid "ETA"
+msgstr "Pozostało"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:323
+msgid "Downloaded"
+msgstr "Pobrano"
+
+#. Translators: Please keep short or translate as " "
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:326
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:340
+msgid "RX"
+msgstr "RX"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:330
+msgid "Uploaded"
+msgstr "Wysłano"
+
+#. Translators: Please keep short or translate as " "
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:333
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:350
+msgid "TX"
+msgstr "TX"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:338
+msgid "Down Rate"
+msgstr "Prędkość pobierania"
+
+#. Translators: Please keep short or translate as " "
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:343
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:352
+msgid "Rate"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:348
+msgid "Up Rate"
+msgstr "Prędkość wysyłania"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:372
+msgid "Stop all torrents and the I2P tunnel"
+msgstr "Zatrzymaj wszystkie torrenty i tunel I2P"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:374
+msgid "Stop All"
+msgstr "Zatrzymaj wszystkie"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:383
+msgid "Start all torrents and the I2P tunnel"
+msgstr "Uruchom wszystkie torrenty i tunel I2P"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:385
+msgid "Start All"
+msgstr "Uruchom wszystkie"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:404
+msgid "No torrents loaded."
+msgstr "Nie załadowano torrentów."
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:409
+msgid "Totals"
+msgstr "Łącznie"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:411
+#, java-format
+msgid "1 torrent"
+msgid_plural "{0} torrents"
+msgstr[0] "{0} torrent"
+msgstr[1] "{0} torrenty"
+msgstr[2] "{0} torrentów"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:414
+#, java-format
+msgid "1 connected peer"
+msgid_plural "{0} connected peers"
+msgstr[0] "{0} podłączony peer"
+msgstr[1] "{0} podłączone peery"
+msgstr[2] "{0} podłączonych peerów"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:498
+msgid "Opening the I2P tunnel"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:505
+#, java-format
+msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:553
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580
+#, java-format
+msgid "Magnet deleted: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:561
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:586
+#, java-format
+msgid "Torrent file deleted: {0}"
+msgstr "Plik torrenta usunięto: {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:592
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:603
+#, java-format
+msgid "Data file deleted: {0}"
+msgstr "Pliki z danymi usunięte: {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:594
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:605
+#, java-format
+msgid "Data file could not be deleted: {0}"
+msgstr "Nie można usunąć pliku z danymi: {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:624
+#, java-format
+msgid "Data dir deleted: {0}"
+msgstr "Usunięto katalog z danymi: {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+msgid "Error creating torrent - you must select a tracker"
+msgstr "Błąd przy tworzeniu torrenta - musisz wybrać tracker"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:678
+#, java-format
+msgid "Torrent created for \"{0}\""
+msgstr "Utworzono torrent dla \"{0}\""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680
+#, java-format
+msgid ""
+"Many I2P trackers require you to register new torrents before seeding - "
+"please do so before starting \"{0}\""
+msgstr ""
+"Wiele trackerów w I2P wymaga zarejestrowania torrenta przed seedowaniem - "
+"proszę, zrób tak przed uruchomieniem \"{0}\""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:682
+#, java-format
+msgid "Error creating a torrent for \"{0}\""
+msgstr "Błąd podczas tworzenia torrenta dla: \"{0}\""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:685
+#, java-format
+msgid "Cannot create a torrent for the nonexistent data: {0}"
+msgstr "Nie można utworzyć torrenta dla nieistniejących danych: {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:688
+msgid "Error creating torrent - you must enter a file or directory"
+msgstr "Błąd przy tworzeniu torrenta - musisz podać plik lub katalog"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:691
+msgid "Stopping all torrents and closing the I2P tunnel."
+msgstr "Zatrzymywanie wszystkich torrentów i zamykanie tunelu I2P"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:702
+msgid "I2P tunnel closed."
+msgstr "Zamknięto tunel I2P."
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:705
+msgid "Opening the I2P tunnel and starting all torrents."
+msgstr "Otwieranie tunelu I2P i uruchamianie wszystkich torrentów."
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:827
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:832
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:838
+msgid "Tracker Error"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:830
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:834
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:846
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:850
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:858
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:867
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:871
+#, java-format
+msgid "1 peer"
+msgid_plural "{0} peers"
+msgstr[0] "{0} peer"
+msgstr[1] "{0} peery"
+msgstr[2] "{0} peerów"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:843
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:848
+msgid "Seeding"
+msgstr "Seedowanie"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:852
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1724
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1830
+msgid "Complete"
+msgstr "Zakończono"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:855
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:860
+msgid "OK"
+msgstr "OK"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:864
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:869
+msgid "Stalled"
+msgstr "Utknięto"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:873
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:876
+msgid "No Peers"
+msgstr "Brak peerów"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:878
+msgid "Stopped"
+msgstr "Zatrzymany"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:910
+msgid "Torrent details"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:922
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1186
+msgid "Info"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:937
+msgid "View files"
+msgstr "Zobacz pliki"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:939
+msgid "Open file"
+msgstr "Otwórz plik"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:981
+msgid "Stop the torrent"
+msgstr "Zatrzymaj torrent"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:983
+msgid "Stop"
+msgstr "Zatrzymaj"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:993
+msgid "Start the torrent"
+msgstr "Uruchom torrent"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:995
+msgid "Start"
+msgstr "Uruchom"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1006
+msgid "Remove the torrent from the active list, deleting the .torrent file"
+msgstr "Usuń torrent z aktywnej listy, usuwając plik .torrent"
+
+#. Can't figure out how to escape double quotes inside the onclick string.
+#. Single quotes in translate strings with parameters must be doubled.
+#. Then the remaining single quite must be escaped
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1011
+#, java-format
+msgid ""
+"Are you sure you want to delete the file \\''{0}.torrent\\'' (downloaded "
+"data will not be deleted) ?"
+msgstr ""
+"Czy na pewno chcesz usunąć plik \\''{0}.torrent\\''? (pobrane dane nie "
+"zostaną usunięte)"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014
+msgid "Remove"
+msgstr "Usuń"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1025
+msgid "Delete the .torrent file and the associated data file(s)"
+msgstr "Usuń plik .torrent i związane z nim pliki z danymi"
+
+#. Can't figure out how to escape double quotes inside the onclick string.
+#. Single quotes in translate strings with parameters must be doubled.
+#. Then the remaining single quite must be escaped
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1030
+#, java-format
+msgid ""
+"Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded "
+"data?"
+msgstr "Czy na pewno chcesz usunąć plik \\''{0}.torrent\\'' oraz pobrane dane?"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1033
+msgid "Delete"
+msgstr "Usuń"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068
+msgid "Unknown"
+msgstr "Nieznany"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1080
+msgid "Seed"
+msgstr "Seed"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1103
+msgid "Uninteresting (The peer has no pieces we need)"
+msgstr "Uninteresting (peer nie ma piece'ów, które potrzebujemy)"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1105
+msgid "Choked (The peer is not allowing us to request pieces)"
+msgstr "Choked (peer nie pozwala nam na prośbę o piece)"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1125
+msgid "Uninterested (We have no pieces the peer needs)"
+msgstr "Uninterested (nie mamy piece'ów, których peer potrzebuje)"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1127
+msgid "Choking (We are not allowing the peer to request pieces)"
+msgstr "Choking (nie pozwalamy peerowi na prośbę o piece)"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1185
+#, java-format
+msgid "Details at {0} tracker"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1215
+msgid "Add Torrent"
+msgstr "Dodaj torrent"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1217
+msgid "From URL"
+msgstr "Z adresu URL"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1220
+msgid ""
+"Enter the torrent file download URL (I2P only), magnet link, or maggot link"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1225
+msgid "Add torrent"
+msgstr "Dodaj torrent"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1228
+#, java-format
+msgid "You can also copy .torrent files to: {0}."
+msgstr "Możesz także skopiować pliki .torrent do: {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1230
+msgid "Removing a .torrent will cause it to stop."
+msgstr "Usunięcie pliku .torrent spowoduje jego zatrzymanie."
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1253
+msgid "Create Torrent"
+msgstr "Utwórz torrent"
+
+#. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\" value=\"" + newFile + "\" /><br>\n");
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1256
+msgid "Data to seed"
+msgstr "Dane do seedowania"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1260
+msgid "File or directory to seed (must be within the specified path)"
+msgstr ""
+"Plik lub katalog do seedowania (musi się znajdować wewnątrz podanej ścieżki)"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1262
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1743
+msgid "Tracker"
+msgstr "Tracker"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1264
+msgid "Select a tracker"
+msgstr "Wybierz tracker"
+
+#. out.write(_("Open trackers and DHT only"));
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1269
+msgid "Open trackers only"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284
+msgid "or"
+msgstr "lub"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1287
+msgid "Specify custom tracker announce URL"
+msgstr "Podaj własny adres announce trackera"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1290
+msgid "Create torrent"
+msgstr "Utwórz torrent"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1311
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479
+msgid "Configuration"
+msgstr "Ustawienia"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1315
+msgid "Data directory"
+msgstr "Katalog z danymi"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1317
+msgid "Edit i2psnark.config and restart to change"
+msgstr ""
+"Edytuj plik i2psnark.config  i uruchom ponownie by zmiany weszły w życie"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1321
+msgid "Files readable by all"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1325
+msgid "If checked, other users may access the downloaded files"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1329
+msgid "Auto start"
+msgstr "Automatyczne uruchamianie"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1333
+msgid "If checked, automatically start torrents that are added"
+msgstr "Jeśli zaznaczone - automatycznie uruchamiaj dodane torrenty"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1337
+msgid "Theme"
+msgstr "Motyw"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1350
+msgid "Refresh time"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1363
+msgid "Never"
+msgstr "Nigdy"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1369
+msgid "Startup delay"
+msgstr "Opóźnienie uruchomienia"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1371
+msgid "minutes"
+msgstr "minuty"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1395
+msgid "Total uploader limit"
+msgstr "Całkowity limit uploaderów"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1398
+msgid "peers"
+msgstr "peery"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1402
+msgid "Up bandwidth limit"
+msgstr "Ograniczenie pasma WY"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1405
+msgid "Half available bandwidth recommended."
+msgstr "Zalecana połowa dostępnego pasma."
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1407
+msgid "View or change router bandwidth"
+msgstr "Zobacz lub zmień pasmo routera"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1411
+msgid "Use open trackers also"
+msgstr "Używaj również otwartych trackerów"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1415
+msgid ""
+"If checked, announce torrents to open trackers as well as the tracker listed "
+"in the torrent file"
+msgstr ""
+"Jeśli zaznaczone, zgłaszaj torrenty do otwartych trackerów, jak również do "
+"trackerów podanych w pliku torrent"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1419
+msgid "Open tracker announce URLs"
+msgstr "URL otwartego trackera"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1431
+msgid "Inbound Settings"
+msgstr "Tunele wejściowe"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1437
+msgid "Outbound Settings"
+msgstr "Tunele wyjściowe"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1445
+msgid "I2CP host"
+msgstr "Adres I2CP"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1450
+msgid "I2CP port"
+msgstr "Port I2CP"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1465
+msgid "I2CP options"
+msgstr "Parametry I2CP"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1470
+msgid "Save configuration"
+msgstr "Zapisz ustawienia"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1495
+#, java-format
+msgid "Invalid magnet URL {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1529
+#, java-format
+msgid "Invalid info hash in magnet URL {0}"
+msgstr ""
+
+#. * dummies for translation
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1559
+#, java-format
+msgid "1 hop"
+msgid_plural "{0} hops"
+msgstr[0] "{0} skok"
+msgstr[1] "{0} skoki"
+msgstr[2] "{0} skoków"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1560
+#, java-format
+msgid "1 tunnel"
+msgid_plural "{0} tunnels"
+msgstr[0] "{0} tunel"
+msgstr[1] "{0} tunele"
+msgstr[2] "{0} tuneli"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1722
+msgid "Completion"
+msgstr ""
+
+#. else unknown
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1776
+msgid "Size"
+msgstr "Rozmiar"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1731
+msgid "Files"
+msgstr "Pliki"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1733
+msgid "Pieces"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1734
+msgid "Piece size"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1756
+msgid "Magnet link"
+msgstr ""
+
+#. We don't have the hash of the torrent file
+#. buf.append("<br>").append(_("Maggot link")).append(": <a href=\"").append(MAGGOT).append(hex).append(':').append(hex).append("\">")
+#. .append(MAGGOT).append(hex).append(':').append(hex).append("</a>");
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1762
+#, fuzzy
+msgid "Torrent file"
+msgstr "Torrent"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1774
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1813
+msgid "Directory"
+msgstr "Katalog"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1783
+msgid "Priority"
+msgstr "Priorytet"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1788
+msgid "Up to higher level directory"
+msgstr "Do katalogu nadrzędnego"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1818
+msgid "Torrent not found?"
+msgstr "Torrent not found?"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1827
+msgid "File not found in torrent?"
+msgstr "File not found in torrent?"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1840
+msgid "complete"
+msgstr "zakończono"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1841
+msgid "bytes remaining"
+msgstr "bajtów pozostało"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1866
+msgid "Open"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1892
+msgid "High"
+msgstr "Wysoki"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1897
+msgid "Normal"
+msgstr "Normalny"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1902
+msgid "Skip"
+msgstr "Pomiń"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1911
+msgid "Save priorities"
+msgstr "Zapisz priorytety"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2027
+#, java-format
+msgid "Torrent fetched from {0}"
+msgstr "Torrent pobrano z {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2048
+#, java-format
+msgid "Torrent already running: {0}"
+msgstr "Torrent już uruchomiony: {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2050
+#, java-format
+msgid "Torrent already in the queue: {0}"
+msgstr "Torrent już w kolejce: {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2056
+#, java-format
+msgid "Torrent at {0} was not valid"
+msgstr "Torrent pobrany z {0} jest niepoprawny"
+
+#. FIXME don't lose peer setting
+#. String peerParam = req.getParameter("p");
+#. if (peerParam != null)
+#. buf.append("<input type=\"hidden\" name=\"p\" value=\"").append(peerParam).append("\" >\n");
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2070
+#, java-format
+msgid "Torrent was not retrieved from {0}"
+msgstr "Torrent nie był pobrany z: {0}"
--- a/apps/i2psnark/locale/messages_pt.po
+++ b/apps/i2psnark/locale/messages_pt.po
--- a/apps/i2psnark/locale/messages_ru.po
+++ b/apps/i2psnark/locale/messages_ru.po
--- a/apps/i2psnark/locale/messages_sv.po
+++ b/apps/i2psnark/locale/messages_sv.po
--- a/apps/i2psnark/locale/messages_vi.po
+++ b/apps/i2psnark/locale/messages_vi.po
@ -0,0 +1,916 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2psnark package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# dich_tran <tran.nathan@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-06-11 08:22+0000\n"
+"PO-Revision-Date: 2011-05-17 18:05+0000\n"
+"Last-Translator: ducki2p <ducki2p@gmail.com>\n"
+"Language-Team: Vietnamese (http://www.transifex.net/projects/p/I2P/team/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:307
+#, java-format
+msgid "Total uploaders limit changed to {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:309
+#, java-format
+msgid "Minimum total uploaders limit is {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:321
+#, java-format
+msgid "Up BW limit changed to {0}KBps"
+msgstr "Giới hạn băng thông lên đổi thành {0}KBps"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:323
+#, java-format
+msgid "Minimum up bandwidth limit is {0}KBps"
+msgstr "Tối thiểu băng thông lên là {0}KBps"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:335
+#, java-format
+msgid "Startup delay changed to {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:386
+msgid "I2CP and tunnel changes will take effect after stopping all torrents"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:393
+msgid "Disconnecting old I2CP destination"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:397
+#, java-format
+msgid "I2CP settings changed to {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:402
+msgid ""
+"Unable to connect with the new settings, reverting to the old I2CP settings"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:406
+msgid "Unable to reconnect with the old settings!"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:408
+msgid "Reconnected on the new I2CP destination"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:418
+#, java-format
+msgid "I2CP listener restarted for \"{0}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:429
+msgid "Enabled autostart"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:431
+msgid "Disabled autostart"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:437
+msgid "Enabled open trackers - torrent restart required to take effect."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:439
+msgid "Disabled open trackers - torrent restart required to take effect."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:447
+msgid "Open Tracker list changed - torrent restart required to take effect."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:454
+#, java-format
+msgid "{0} theme loaded, return to main i2psnark page to view."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:461
+msgid "Configuration unchanged."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:471
+#, java-format
+msgid "Unable to save the config to {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:536
+msgid "Connecting to I2P"
+msgstr "Nối kết vào I2P"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:539
+msgid "Error connecting to I2P - check your I2CP settings!"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:548
+#, java-format
+msgid "Error: Could not add the torrent {0}"
+msgstr ""
+
+#. catch this here so we don't try do delete it below
+#: ../java/src/org/klomp/snark/SnarkManager.java:570
+#, java-format
+msgid "Cannot open \"{0}\""
+msgstr ""
+
+#. TODO - if the existing one is a magnet, delete it and add the metainfo
+#. instead?
+#: ../java/src/org/klomp/snark/SnarkManager.java:589
+#: ../java/src/org/klomp/snark/SnarkManager.java:665
+#: ../java/src/org/klomp/snark/SnarkManager.java:720
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1976
+#, java-format
+msgid "Torrent with this info hash is already running: {0}"
+msgstr ""
+
+#. addMessage(_("Warning - No I2P trackers in \"{0}\", will announce to I2P
+#. open trackers and DHT only.", info.getName()));
+#: ../java/src/org/klomp/snark/SnarkManager.java:596
+#, java-format
+msgid ""
+"Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers "
+"only."
+msgstr ""
+
+#. addMessage(_("Warning - No I2P trackers in \"{0}\", and DHT and open
+#. trackers are disabled, you should enable open trackers or DHT before
+#. starting the torrent.", info.getName()));
+#: ../java/src/org/klomp/snark/SnarkManager.java:601
+#, java-format
+msgid ""
+"Warning - No I2P Trackers found in \"{0}\". Make sure Open Tracker is "
+"enabled before starting this torrent."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:622
+#, java-format
+msgid "Torrent in \"{0}\" is invalid"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:627
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1998
+#, java-format
+msgid "ERROR - Out of memory, cannot create torrent from {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:639
+#, java-format
+msgid "Torrent added and started: \"{0}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:641
+#, java-format
+msgid "Torrent added: \"{0}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:676
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:491
+#, java-format
+msgid "Fetching {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:679
+#, java-format
+msgid ""
+"We have no saved peers and no other torrents are running. Fetch of {0} will "
+"not succeed until you start another torrent."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:683
+#, java-format
+msgid "Adding {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:730
+#: ../java/src/org/klomp/snark/SnarkManager.java:753
+#: ../java/src/org/klomp/snark/SnarkManager.java:1180
+#, java-format
+msgid "Failed to copy torrent file to {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:976
+#, java-format
+msgid "Too many files in \"{0}\" ({1}), deleting it!"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:978
+#, java-format
+msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:980
+#, java-format
+msgid "No pieces in \"{0}\",  deleting it!"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:982
+#, java-format
+msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:984
+#, java-format
+msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:985
+#, java-format
+msgid "Limit is {0}B"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:987
+#, java-format
+msgid "Torrent \"{0}\" has no data, deleting it!"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:995
+#, java-format
+msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1011
+#, java-format
+msgid "Error: Could not remove the torrent {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1032
+#: ../java/src/org/klomp/snark/SnarkManager.java:1050
+#, java-format
+msgid "Torrent stopped: \"{0}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1071
+#, java-format
+msgid "Torrent removed: \"{0}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1079
+#, java-format
+msgid "Adding torrents in {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1128
+#, java-format
+msgid "Download finished: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1176
+#, java-format
+msgid "Metainfo received for {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1177
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:526
+#, java-format
+msgid "Starting up torrent {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1231
+msgid "Unable to connect to I2P!"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:1237
+#, java-format
+msgid "Unable to add {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:205
+msgid "I2PSnark - Anonymous BitTorrent Client"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:218
+msgid "Torrents"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:221
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:228
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1028
+msgid "I2PSnark"
+msgstr "I2PSnark"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:225
+msgid "Refresh page"
+msgstr "Nạp lại trang"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:230
+msgid "Forum"
+msgstr "Diễn đàn"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:284
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1719
+msgid "Status"
+msgstr "Tình trạng"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:290
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:292
+msgid "Hide Peers"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:297
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:299
+msgid "Show Peers"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:306
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1643
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1659
+msgid "Torrent"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:310
+msgid "Estimated time remaining"
+msgstr ""
+
+#. Translators: Please keep short or translate as " "
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:313
+msgid "ETA"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:317
+msgid "Downloaded"
+msgstr "Đã tải xuống"
+
+#. Translators: Please keep short or translate as " "
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:320
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:334
+msgid "RX"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:324
+msgid "Uploaded"
+msgstr "Đã tải lên"
+
+#. Translators: Please keep short or translate as " "
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:327
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:344
+msgid "TX"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:332
+msgid "Down Rate"
+msgstr ""
+
+#. Translators: Please keep short or translate as " "
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:337
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:346
+msgid "Rate"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:342
+msgid "Up Rate"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:366
+msgid "Stop all torrents and the I2P tunnel"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:368
+msgid "Stop All"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:377
+msgid "Start all torrents and the I2P tunnel"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:379
+msgid "Start All"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:398
+msgid "No torrents loaded."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:403
+msgid "Totals"
+msgstr "Tổng cộng"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:405
+#, java-format
+msgid "1 torrent"
+msgid_plural "{0} torrents"
+msgstr[0] ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:408
+#, java-format
+msgid "1 connected peer"
+msgid_plural "{0} connected peers"
+msgstr[0] ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:497
+#, java-format
+msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:545
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:572
+#, java-format
+msgid "Magnet deleted: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:553
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:578
+#, java-format
+msgid "Torrent file deleted: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:584
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:594
+#, java-format
+msgid "Data file deleted: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:586
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596
+#, java-format
+msgid "Data file could not be deleted: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:605
+#, java-format
+msgid "Data dir deleted: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:638
+msgid "Error creating torrent - you must select a tracker"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:653
+#, java-format
+msgid "Torrent created for \"{0}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:655
+#, java-format
+msgid ""
+"Many I2P trackers require you to register new torrents before seeding - "
+"please do so before starting \"{0}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:657
+#, java-format
+msgid "Error creating a torrent for \"{0}\""
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:660
+#, java-format
+msgid "Cannot create a torrent for the nonexistent data: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+msgid "Error creating torrent - you must enter a file or directory"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:666
+msgid "Stopping all torrents and closing the I2P tunnel."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:677
+msgid "I2P tunnel closed."
+msgstr "Đường hầm I2P đóng lại."
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680
+msgid "Opening the I2P tunnel and starting all torrents."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:803
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:808
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:814
+msgid "Tracker Error"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:806
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:810
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:822
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:826
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:834
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:838
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:843
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:847
+#, java-format
+msgid "1 peer"
+msgid_plural "{0} peers"
+msgstr[0] ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:819
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:824
+msgid "Seeding"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:828
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1665
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1770
+msgid "Complete"
+msgstr "Hoàn tất"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:831
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:836
+msgid "OK"
+msgstr "OK"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:840
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:845
+msgid "Stalled"
+msgstr "Khựng"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:849
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:852
+msgid "No Peers"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854
+msgid "Stopped"
+msgstr "Ngưng"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:886
+msgid "Torrent details"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:898
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1160
+msgid "Info"
+msgstr "Thông tin"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:913
+msgid "View files"
+msgstr "Xem tập tin"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:915
+msgid "Open file"
+msgstr "Mở tập tin"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:957
+msgid "Stop the torrent"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:959
+msgid "Stop"
+msgstr "Ngưng"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:969
+msgid "Start the torrent"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:971
+msgid "Start"
+msgstr "Bắt đầu"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:982
+msgid "Remove the torrent from the active list, deleting the .torrent file"
+msgstr ""
+
+#. Can't figure out how to escape double quotes inside the onclick string.
+#. Single quotes in translate strings with parameters must be doubled.
+#. Then the remaining single quite must be escaped
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:987
+#, java-format
+msgid ""
+"Are you sure you want to delete the file \\''{0}.torrent\\'' (downloaded "
+"data will not be deleted) ?"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:990
+msgid "Remove"
+msgstr "Bỏ"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1001
+msgid "Delete the .torrent file and the associated data file(s)"
+msgstr ""
+
+#. Can't figure out how to escape double quotes inside the onclick string.
+#. Single quotes in translate strings with parameters must be doubled.
+#. Then the remaining single quite must be escaped
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1006
+#, java-format
+msgid ""
+"Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded "
+"data?"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1009
+msgid "Delete"
+msgstr "Xóa"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1042
+msgid "Unknown"
+msgstr "Không rõ"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1054
+msgid "Seed"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1077
+msgid "Uninteresting (The peer has no pieces we need)"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1079
+msgid "Choked (The peer is not allowing us to request pieces)"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1099
+msgid "Uninterested (We have no pieces the peer needs)"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1101
+msgid "Choking (We are not allowing the peer to request pieces)"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1159
+#, java-format
+msgid "Details at {0} tracker"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1188
+msgid "Add Torrent"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1190
+msgid "From URL"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1193
+msgid ""
+"Enter the torrent file download URL (I2P only), magnet link, or maggot link"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1198
+msgid "Add torrent"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1201
+#, java-format
+msgid "You can also copy .torrent files to: {0}."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1203
+msgid "Removing a .torrent will cause it to stop."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1226
+msgid "Create Torrent"
+msgstr ""
+
+#. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\"
+#. value=\"" + newFile + "\" /><br>\n");
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229
+msgid "Data to seed"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233
+msgid "File or directory to seed (must be within the specified path)"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1235
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684
+msgid "Tracker"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237
+msgid "Select a tracker"
+msgstr ""
+
+#. out.write(_("Open trackers and DHT only"));
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1242
+msgid "Open trackers only"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1257
+msgid "or"
+msgstr "hoặc"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1260
+msgid "Specify custom tracker announce URL"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1263
+msgid "Create torrent"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1281
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1420
+msgid "Configuration"
+msgstr "Cấu hình"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1285
+msgid "Data directory"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1287
+msgid "Edit i2psnark.config and restart to change"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1291
+msgid "Auto start"
+msgstr "Tự động bắt đầu"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295
+msgid "If checked, automatically start torrents that are added"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1299
+msgid "Theme"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1312
+msgid "Startup delay"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1314
+msgid "minutes"
+msgstr "phút"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1338
+msgid "Total uploader limit"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1341
+msgid "peers"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1345
+msgid "Up bandwidth limit"
+msgstr "Giới hạn băng thông lên"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348
+msgid "Half available bandwidth recommended."
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1350
+msgid "View or change router bandwidth"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1354
+msgid "Use open trackers also"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1358
+msgid ""
+"If checked, announce torrents to open trackers as well as the tracker listed"
+" in the torrent file"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1362
+msgid "Open tracker announce URLs"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1374
+msgid "Inbound Settings"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1380
+msgid "Outbound Settings"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1388
+msgid "I2CP host"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1393
+msgid "I2CP port"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1406
+msgid "I2CP options"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1411
+msgid "Save configuration"
+msgstr "Lưu cấu hình"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1436
+#, java-format
+msgid "Invalid magnet URL {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1470
+#, java-format
+msgid "Invalid info hash in magnet URL {0}"
+msgstr ""
+
+#. * dummies for translation
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1500
+#, java-format
+msgid "1 hop"
+msgid_plural "{0} hops"
+msgstr[0] ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1501
+#, java-format
+msgid "1 tunnel"
+msgid_plural "{0} tunnels"
+msgstr[0] ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1663
+msgid "Completion"
+msgstr ""
+
+#. else unknown
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1667
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1716
+msgid "Size"
+msgstr "Kích thước"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1672
+msgid "Files"
+msgstr "Tập tin"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1674
+msgid "Pieces"
+msgstr "Mảnh"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1675
+msgid "Piece size"
+msgstr "Kích thước mảnh"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1697
+msgid "Magnet link"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1714
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1753
+msgid "Directory"
+msgstr "Danh mục"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1723
+msgid "Priority"
+msgstr "Ưu tiên"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1728
+msgid "Up to higher level directory"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1758
+msgid "Torrent not found?"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1767
+msgid "File not found in torrent?"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1780
+msgid "complete"
+msgstr "hoàn tất"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1781
+msgid "bytes remaining"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1806
+msgid "Open"
+msgstr "Mở"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1832
+msgid "High"
+msgstr "Cao"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1837
+msgid "Normal"
+msgstr "Thường"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1842
+msgid "Skip"
+msgstr "Lờ"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1851
+msgid "Save priorities"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1967
+#, java-format
+msgid "Torrent fetched from {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1988
+#, java-format
+msgid "Torrent already running: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1990
+#, java-format
+msgid "Torrent already in the queue: {0}"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1996
+#, java-format
+msgid "Torrent at {0} was not valid"
+msgstr ""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2003
+#, java-format
+msgid "Torrent was not retrieved from {0}"
+msgstr ""
+
+
--- a/apps/i2ptunnel/java/build.xml
+++ b/apps/i2ptunnel/java/build.xml
@ -20,7 +20,10 @@
            </classpath>
        </depend>
    </target>
+
    <property name="javac.compilerargs" value="" />
+    <property name="require.gettext" value="true" />
+
    <target name="compile" depends="depend">
        <mkdir dir="./build" />
        <mkdir dir="./build/obj" />
@ -34,10 +37,7 @@
        </javac>
    </target>

-    <!-- TODO: Move the web classes from the jar to the war - they are not part of the API
-      -  This will require sponge to rewrite some seedless stuff that uses it.
-     -->
-    <target name="jar" depends="builddep, compile, jarUpToDate" unless="jar.uptodate" >
+    <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
        <exec executable="mtn" outputproperty="workspace.changes.j" errorproperty="mtn.error2" failifexecutionfails="false" >
            <arg value="list" />
            <arg value="changed" />
@ -49,30 +49,48 @@
            <arg value="[:space:]" />
            <arg value="," />
        </exec>
-        <jar destfile="./build/i2ptunnel.jar" basedir="./build/obj" includes="**/*.class">
+    </target>
+
+
+    <!-- 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" >
+        <!-- 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" >
            <manifest>
                <attribute name="Main-Class" value="net.i2p.i2ptunnel.I2PTunnel" />
                <attribute name="Class-Path" value="i2p.jar mstreaming.jar" />
+                <attribute name="Implementation-Version" value="${full.version}" />
+                <attribute name="Built-By" value="${build.built-by}" />
                <attribute name="Build-Date" value="${build.timestamp}" />
                <attribute name="Base-Revision" value="${workspace.version}" />
                <attribute name="Workspace-Changes" value="${workspace.changes.j.tr}" />
            </manifest>
        </jar>
+        <jar destfile="./build/temp-beans.jar" basedir="./build/obj" includes="**/EditBean.class **/IndexBean.class" />
    </target>

    <target name="jarUpToDate">
        <uptodate property="jar.uptodate" targetfile="build/i2ptunnel.jar" >
            <srcfiles dir= "build/obj" includes="**/*.class" />
        </uptodate>
+        <condition property="shouldListChanges" >
+            <and>
+                <not>
+                    <isset property="jar.uptodate" />
+                </not>
+                <isset property="mtn.available" />
+            </and>
+        </condition>
    </target>

    <target name="bundle" depends="compile, precompilejsp">
        <!-- 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" >
+        <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
            <arg value="./bundle-messages.sh" />
        </exec>
-        <exec executable="sh" osfamily="mac" failifexecutionfails="true" >
+        <exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="${require.gettext}" >
            <arg value="./bundle-messages.sh" />
        </exec>
 		<!-- multi-lang is optional -->
@ -83,21 +101,21 @@

    <target name="poupdate" depends="compile, precompilejsp">
        <!-- Update the messages_*.po files. -->
-        <exec executable="sh" osfamily="unix" failifexecutionfails="true" >
+        <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="true" >
            <arg value="./bundle-messages.sh" />
            <arg value="-p" />
        </exec>
-        <exec executable="sh" osfamily="mac" failifexecutionfails="true" >
+        <exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="true" >
            <arg value="./bundle-messages.sh" />
            <arg value="-p" />
        </exec>
-        <exec executable="sh" osfamily="windows" failifexecutionfails="true" >
+        <exec executable="sh" osfamily="windows" failifexecutionfails="true" failonerror="true" >
            <arg value="./bundle-messages.sh" />
            <arg value="-p" />
        </exec>
    </target>

-    <target name="war" depends="precompilejsp, bundle, warUpToDate" unless="war.uptodate" > 
+    <target name="listChangedFiles2" depends="warUpToDate" if="shouldListChanges2" >
        <exec executable="mtn" outputproperty="workspace.changes.w" errorproperty="mtn.error2" failifexecutionfails="false" >
            <arg value="list" />
            <arg value="changed" />
@ -109,9 +127,19 @@
            <arg value="[:space:]" />
            <arg value="," />
        </exec>
+    </target>
+
+    <!-- The web classes are now in the war not the jar - they are not part of the API -->
+    <target name="war" depends="precompilejsp, bundle, warUpToDate, listChangedFiles2" unless="war.uptodate" > 
+        <!-- set if unset -->
+        <property name="workspace.changes.w.tr" value="" />
+        <copy file="build/obj/net/i2p/i2ptunnel/web/EditBean.class" todir="../jsp/WEB-INF/classes/net/i2p/i2ptunnel/web" />
+        <copy file="build/obj/net/i2p/i2ptunnel/web/IndexBean.class" todir="../jsp/WEB-INF/classes/net/i2p/i2ptunnel/web" />
        <war destfile="build/i2ptunnel.war" webxml="../jsp/web-out.xml"
             basedir="../jsp/" excludes="web.xml, web-fragment.xml, web-out.xml, **/*.java, *.jsp">
            <manifest>
+                <attribute name="Implementation-Version" value="${full.version}" />
+                <attribute name="Built-By" value="${build.built-by}" />
                <attribute name="Build-Date" value="${build.timestamp}" />
                <attribute name="Base-Revision" value="${workspace.version}" />
                <attribute name="Workspace-Changes" value="${workspace.changes.w.tr}" />
@ -123,6 +151,14 @@
        <uptodate property="war.uptodate" targetfile="build/i2ptunnel.war" >
            <srcfiles dir= "../jsp" excludes="web.xml, web-fragment.xml, **/*.java, *.jsp" />
        </uptodate>
+        <condition property="shouldListChanges2" >
+            <and>
+                <not>
+                    <isset property="war.uptodate" />
+                </not>
+                <isset property="mtn.available" />
+            </and>
+        </condition>
    </target>

    <target name="precompilejsp" depends="jar" unless="precompilejsp.uptodate">
@ -139,11 +175,14 @@
                <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/ant.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" />
            </classpath>
            <arg value="-d" />
            <arg value="../jsp/WEB-INF/classes" />
+            <arg value="-v" />
            <arg value="-p" />
            <arg value="net.i2p.i2ptunnel.jsp" />
            <arg value="-webinc" />
@ -160,7 +199,9 @@
                <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" />
            </classpath>
        </javac>
        <copy file="../jsp/web.xml" tofile="../jsp/web-out.xml" />
--- a/apps/i2ptunnel/java/bundle-messages.sh
+++ b/apps/i2ptunnel/java/bundle-messages.sh
@ -12,6 +12,7 @@
 CLASS=net.i2p.i2ptunnel.web.messages
 TMPFILE=build/javafiles.txt
 export TZ=UTC
+RC=0

 if [ "$1" = "-p" ]
 then
@ -69,15 +70,17 @@ do
 		         -o ${i}t
 		if [ $? -ne 0 ]
 		then
-			echo 'Warning - xgettext failed, not updating translations'
+			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 'Warning - msgmerge failed, not updating translations'
+			echo "ERROR - msgmerge failed on ${i}, not updating translations"
 			rm -f ${i}t
+			RC=1
 			break
 		fi
 		rm -f ${i}t
@ -94,11 +97,13 @@ do
        msgfmt --java --statistics -r $CLASS -l $LG -d ../jsp/WEB-INF/classes $i
        if [ $? -ne 0 ]
        then
-            echo 'Warning - msgfmt failed, not updating translations'
+            echo "ERROR - msgfmt failed on ${i}, not updating translations"
+            # msgfmt leaves the class file there so the build would work the next time
+            find src/WEB-INF/classes -name messages_${LG}.class -exec rm -f {} \;
+            RC=1
            break
        fi
    fi
 done
 rm -f $TMPFILE
-# todo: return failure
-exit 0
+exit $RC
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java
@ -8,21 +8,21 @@ package net.i2p.i2ptunnel;
 *
 */

-import java.io.ByteArrayOutputStream;
 import java.io.FilterOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
-import java.util.zip.GZIPInputStream;
+import java.util.Locale;
 import java.util.concurrent.RejectedExecutionException;

 import net.i2p.I2PAppContext;
 import net.i2p.data.ByteArray;
+import net.i2p.util.BigPipedInputStream;
 import net.i2p.util.ByteCache;
-import net.i2p.util.I2PAppThread;
 import net.i2p.util.Log;
+import net.i2p.util.ReusableGZIPInputStream;

 /**
 * This does the transparent gzip decompression on the client side.
@ -43,8 +43,9 @@ class HTTPResponseOutputStream extends FilterOutputStream {
    private boolean _headerWritten;
    private final byte _buf1[];
    protected boolean _gzip;
-    private long _dataWritten;
-    private InternalGZIPInputStream _in;
+    protected long _dataExpected;
+    protected String _contentType;
+
    private static final int CACHE_SIZE = 8*1024;
    private static final ByteCache _cache = ByteCache.getInstance(8, CACHE_SIZE);
    // OOM DOS prevention
@ -74,7 +75,6 @@ class HTTPResponseOutputStream extends FilterOutputStream {
    public void write(byte buf[], int off, int len) throws IOException {
        if (_headerWritten) {
            out.write(buf, off, len);
-            _dataWritten += len;
            //out.flush();
            return;
        }
@ -90,7 +90,6 @@ class HTTPResponseOutputStream extends FilterOutputStream {
                if (i + 1 < len) {
                    // write out the remaining
                    out.write(buf, off+i+1, len-i-1);
-                    _dataWritten += len-i-1;
                    //out.flush();
                }
                return;
@ -129,10 +128,11 @@ class HTTPResponseOutputStream extends FilterOutputStream {
    }
    
    /**
-     * Tweak that first HTTP response line (HTTP 200 OK, etc)
+     * Possibly tweak that first HTTP response line (HTTP/1.0 200 OK, etc).
+     * Overridden on server side.
     *
     */
-    protected static String filterResponseLine(String line) {
+    protected String filterResponseLine(String line) {
        return line;
    }
    
@ -172,17 +172,27 @@ class HTTPResponseOutputStream extends FilterOutputStream {
                            if (_log.shouldLog(Log.INFO))
                                _log.info("Response header [" + key + "] = [" + val + "]");
                            
-                            if ("Connection".equalsIgnoreCase(key)) {
+                            String lcKey = key.toLowerCase(Locale.US);
+                            if ("connection".equals(lcKey)) {
                                out.write("Connection: close\r\n".getBytes());
                                connectionSent = true;
-                            } else if ("Proxy-Connection".equalsIgnoreCase(key)) {
+                            } else if ("proxy-connection".equals(lcKey)) {
                                out.write("Proxy-Connection: close\r\n".getBytes());
                                proxyConnectionSent = true;
-                            } else if ( ("Content-encoding".equalsIgnoreCase(key)) && ("x-i2p-gzip".equalsIgnoreCase(val)) ) {
+                            } else if ("content-encoding".equals(lcKey) && "x-i2p-gzip".equals(val.toLowerCase(Locale.US))) {
                                _gzip = true;
-                            } else if ("Proxy-Authenticate".equalsIgnoreCase(key)) {
+                            } else if ("proxy-authenticate".equals(lcKey)) {
                                // filter this hop-by-hop header; outproxy authentication must be configured in I2PTunnelHTTPClient
                            } else {
+                                if ("content-length".equals(lcKey)) {
+                                    // save for compress decision on server side
+                                    try {
+                                        _dataExpected = Long.parseLong(val);
+                                    } catch (NumberFormatException nfe) {}
+                                } else if ("content-type".equals(lcKey)) {
+                                    // save for compress decision on server side
+                                    _contentType = val;
+                                }
                                out.write((key.trim() + ": " + val.trim() + "\r\n").getBytes());
                            }
                            break;
@ -227,13 +237,13 @@ class HTTPResponseOutputStream extends FilterOutputStream {
    
    protected void beginProcessing() throws IOException {
        //out.flush();
-        PipedInputStream pi = new PipedInputStream();
+        PipedInputStream pi = BigPipedInputStream.getInstance();
        PipedOutputStream po = new PipedOutputStream(pi);
        // Run in the client thread pool, as there should be an unused thread
        // there after the accept().
        // Overridden in I2PTunnelHTTPServer, where it does not use the client pool.
        try {
-            I2PTunnelClientBase._executor.execute(new Pusher(pi, out));
+            I2PTunnelClientBase.getClientExecutor().execute(new Pusher(pi, out));
        } catch (RejectedExecutionException ree) {
            // shouldn't happen
            throw ree;
@ -242,25 +252,29 @@ class HTTPResponseOutputStream extends FilterOutputStream {
    }
    
    private class Pusher implements Runnable {
-        private InputStream _inRaw;
-        private OutputStream _out;
+        private final InputStream _inRaw;
+        private final OutputStream _out;
+
        public Pusher(InputStream in, OutputStream out) {
            _inRaw = in;
            _out = out;
        }
+
        public void run() {
-            _in = null;
+            ReusableGZIPInputStream _in = null;
            long written = 0;
            ByteArray ba = null;
            try {
-                _in = new InternalGZIPInputStream(_inRaw);
+                _in = ReusableGZIPInputStream.acquire();
+                // blocking
+                _in.initialize(_inRaw);
                ba = _cache.acquire();
                byte buf[] = ba.getData();
                int read = -1;
                while ( (read = _in.read(buf)) != -1) {
                    if (_log.shouldLog(Log.DEBUG))
                        _log.debug("Read " + read + " and writing it to the browser/streams");
-                    _out.write(buf, 0, read);
+;                   _out.write(buf, 0, read);
                    _out.flush();
                    written += read;
                }
@ -272,13 +286,11 @@ class HTTPResponseOutputStream extends FilterOutputStream {
            } catch (OutOfMemoryError oom) {
                _log.error("OOM in HTTP Decompressor", oom);
            } finally {
-                if (_log.shouldLog(Log.WARN) && (_in != null))
-                    _log.warn("After decompression, written=" + written + 
-                              (_in != null ?
+                if (_log.shouldLog(Log.INFO) && (_in != null))
+                    _log.info("After decompression, written=" + written + 
                                " read=" + _in.getTotalRead() 
                                + ", expanded=" + _in.getTotalExpanded() + ", remaining=" + _in.getRemaining() 
-                                + ", finished=" + _in.getFinished()
-                               : ""));
+                                + ", finished=" + _in.getFinished());
                if (ba != null)
                    _cache.release(ba);
                if (_out != null) try { 
@ -286,68 +298,21 @@ class HTTPResponseOutputStream extends FilterOutputStream {
                } catch (IOException ioe) {}
            }

-            double compressed = (_in != null ? _in.getTotalRead() : 0);
-            double expanded = (_in != null ? _in.getTotalExpanded() : 0);
-            if (compressed > 0 && expanded > 0) {
-                // only update the stats if we did something
-                double ratio = compressed/expanded;
-                _context.statManager().addRateData("i2ptunnel.httpCompressionRatio", (int)(100d*ratio), 0);
-                _context.statManager().addRateData("i2ptunnel.httpCompressed", (long)compressed, 0);
-                _context.statManager().addRateData("i2ptunnel.httpExpanded", (long)expanded, 0);
+            if (_in != null) {
+                double compressed = _in.getTotalRead();
+                double expanded = _in.getTotalExpanded();
+                ReusableGZIPInputStream.release(_in);
+                if (compressed > 0 && expanded > 0) {
+                    // only update the stats if we did something
+                    double ratio = compressed/expanded;
+                    _context.statManager().addRateData("i2ptunnel.httpCompressionRatio", (int)(100d*ratio), 0);
+                    _context.statManager().addRateData("i2ptunnel.httpCompressed", (long)compressed, 0);
+                    _context.statManager().addRateData("i2ptunnel.httpExpanded", (long)expanded, 0);
+                }
            }
        }
    }

-    /** just a wrapper to provide stats for debugging */
-    private static class InternalGZIPInputStream extends GZIPInputStream {
-        public InternalGZIPInputStream(InputStream in) throws IOException {
-            super(in);
-        }
-        public long getTotalRead() { 
-            try {
-                return super.inf.getTotalIn(); 
-            } catch (Exception e) { 
-                return 0; 
-            }
-        }
-        public long getTotalExpanded() { 
-            try {
-                return super.inf.getTotalOut(); 
-            } catch (Exception e) {
-                return 0;
-            }
-        }
-
-        /**
-         *  From Inflater javadoc:
-         *  Returns the total number of bytes remaining in the input buffer. This can be used to find out
-         *  what bytes still remain in the input buffer after decompression has finished.
-         */
-        public long getRemaining() { 
-            try {
-                return super.inf.getRemaining(); 
-            } catch (Exception e) {
-                return 0;
-            }
-        }
-        public boolean getFinished() { 
-            try {
-                return super.inf.finished(); 
-            } catch (Exception e) {
-                return true;
-            }
-        }
-        @Override
-        public String toString() { 
-            return "Read: " + getTotalRead() + " expanded: " + getTotalExpanded() + " remaining: " + getRemaining() + " finished: " + getFinished();
-        }
-    }
-    
-    @Override
-    public String toString() {
-        return super.toString() + ": " + _in;
-    }
-    
 /*******
    public static void main(String args[]) {
        String simple   = "HTTP/1.1 200 OK\n" +
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
@ -44,8 +44,8 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Properties;
 import java.util.Set;
 import java.util.StringTokenizer;
@ -65,21 +65,22 @@ import net.i2p.i2ptunnel.socks.I2PSOCKSIRCTunnel;
 import net.i2p.i2ptunnel.socks.I2PSOCKSTunnel;
 import net.i2p.i2ptunnel.streamr.StreamrConsumer;
 import net.i2p.i2ptunnel.streamr.StreamrProducer;
-import net.i2p.util.EventDispatcher;
 import net.i2p.util.EventDispatcherImpl;
 import net.i2p.util.Log;

 /**
+ *  An I2PTunnel tracks one or more I2PTunnelTasks and one or more I2PSessions.
+ *  Usually one of each.
+ *
 *  Todo: Most events are not listened to elsewhere, so error propagation is poor
 */
-public class I2PTunnel implements Logging, EventDispatcher {
-    private Log _log;
-    private EventDispatcherImpl _event;
-    private I2PAppContext _context;
+public class I2PTunnel extends EventDispatcherImpl implements Logging {
+    private final Log _log;
+    private final I2PAppContext _context;
    private static long __tunnelId = 0;
-    private long _tunnelId;
-    private Properties _clientOptions;
-    private final List<I2PSession> _sessions;
+    private final long _tunnelId;
+    private final Properties _clientOptions;
+    private final Set<I2PSession> _sessions;

    public static final int PACKET_DELAY = 100;

@ -96,7 +97,7 @@ public class I2PTunnel implements Logging, EventDispatcher {

    private static final String nocli_args[] = { "-nocli", "-die"};

-    private final List tasks = new ArrayList();
+    private final List<I2PTunnelTask> tasks = new ArrayList();
    private int next_task_id = 1;

    private final Set listeners = new CopyOnWriteArraySet();
@ -114,14 +115,14 @@ public class I2PTunnel implements Logging, EventDispatcher {
    }

    public I2PTunnel(String[] args, ConnectionEventListener lsnr) {
+        super();
        _context = I2PAppContext.getGlobalContext(); // new I2PAppContext();
        _tunnelId = ++__tunnelId;
        _log = _context.logManager().getLog(I2PTunnel.class);
-        _event = new EventDispatcherImpl();
        // as of 0.8.4, include context properties
        Properties p = _context.getProperties();
        _clientOptions = p;
-        _sessions = new ArrayList(1);
+        _sessions = new CopyOnWriteArraySet();
        
        addConnectionEventListener(lsnr);
        boolean gui = true;
@ -193,22 +194,17 @@ public class I2PTunnel implements Logging, EventDispatcher {

    /** @return non-null */
    List<I2PSession> getSessions() { 
-        synchronized (_sessions) {
            return new ArrayList(_sessions); 
-        }
    }
+
    void addSession(I2PSession session) { 
        if (session == null) return;
-        synchronized (_sessions) {
-            if (!_sessions.contains(session))
-                _sessions.add(session);
-        }
+        _sessions.add(session);
    }
+
    void removeSession(I2PSession session) { 
        if (session == null) return;
-        synchronized (_sessions) {
-            _sessions.remove(session);
-        }
+        _sessions.remove(session);
    }
    
    public Properties getClientOptions() { return _clientOptions; }
@ -218,9 +214,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
        if (tsk.isOpen()) {
            tsk.setId(next_task_id);
            next_task_id++;
-            synchronized (tasks) {
-                tasks.add(tsk);
-            }
+            tasks.add(tsk);
        }
    }

@ -237,7 +231,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
    public void runCommand(String cmd, Logging l) {
        if (cmd.indexOf(" ") == -1) cmd += " ";
        int iii = cmd.indexOf(" ");
-        String cmdname = cmd.substring(0, iii).toLowerCase();
+        String cmdname = cmd.substring(0, iii).toLowerCase(Locale.US);
        String allargs = cmd.substring(iii + 1);
        String[] args = split(allargs, " "); // .split(" "); // java 1.4

@ -305,7 +299,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
     *
     * @param l logger to receive events and output
     */
-    public void runHelp(Logging l) {
+    private static void runHelp(Logging l) {
        l.log("Command list:");
        l.log("config <i2phost> <i2pport>");
        l.log("listen_on <ip>");
@ -398,7 +392,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
                notifyEvent("serverTaskId", Integer.valueOf(-1));
                throw new IllegalArgumentException(getPrefix() + "Cannot open private key file " + args[2]);
            }
-            I2PTunnelServer serv = new I2PTunnelServer(serverHost, portNum, privKeyFile, args[2], l, (EventDispatcher) this, this);
+            I2PTunnelServer serv = new I2PTunnelServer(serverHost, portNum, privKeyFile, args[2], l, this, this);
            serv.setReadTimeout(readTimeout);
            serv.startRunning();
            addtask(serv);
@ -449,7 +443,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
                notifyEvent("serverTaskId", Integer.valueOf(-1));
                throw new IllegalArgumentException(getPrefix() + "Cannot open private key file " + args[2]);
            }
-            I2PTunnelServer serv = new I2PTunnelIRCServer(serverHost, portNum, privKeyFile, args[2], l, (EventDispatcher) this, this);
+            I2PTunnelServer serv = new I2PTunnelIRCServer(serverHost, portNum, privKeyFile, args[2], l, this, this);
            serv.setReadTimeout(readTimeout);
            serv.startRunning();
            addtask(serv);
@ -510,7 +504,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
                notifyEvent("serverTaskId", Integer.valueOf(-1));
                throw new IllegalArgumentException(getPrefix() + "Cannot open private key file " + args[3]);
            }
-            I2PTunnelHTTPServer serv = new I2PTunnelHTTPServer(serverHost, portNum, privKeyFile, args[3], spoofedHost, l, (EventDispatcher) this, this);
+            I2PTunnelHTTPServer serv = new I2PTunnelHTTPServer(serverHost, portNum, privKeyFile, args[3], spoofedHost, l, this, this);
            serv.setReadTimeout(readTimeout);
            serv.startRunning();
            addtask(serv);
@ -586,7 +580,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
                throw new IllegalArgumentException(getPrefix() + "Cannot open private key file " + args[4]);
            }

-            I2PTunnelHTTPBidirServer serv = new I2PTunnelHTTPBidirServer(serverHost, portNum, port2Num, privKeyFile, args[3], spoofedHost, l, (EventDispatcher) this, this);
+            I2PTunnelHTTPBidirServer serv = new I2PTunnelHTTPBidirServer(serverHost, portNum, port2Num, privKeyFile, args[3], spoofedHost, l, this, this);
            serv.setReadTimeout(readTimeout);
            serv.startRunning();
            addtask(serv);
@ -640,7 +634,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
            if (portNum <= 0)
                throw new IllegalArgumentException(getPrefix() + "Bad port " + args[1]);

-            I2PTunnelServer serv = new I2PTunnelServer(serverHost, portNum, args[2], l, (EventDispatcher) this, this);
+            I2PTunnelServer serv = new I2PTunnelServer(serverHost, portNum, args[2], l, this, this);
            serv.setReadTimeout(readTimeout);
            serv.startRunning();
            addtask(serv);
@ -688,12 +682,12 @@ public class I2PTunnel implements Logging, EventDispatcher {
                String privateKeyFile = null;
                if (args.length >= 4)
                    privateKeyFile = args[3];
-                task = new I2PTunnelClient(portNum, args[1], l, ownDest, (EventDispatcher) this, this, privateKeyFile);
+                task = new I2PTunnelClient(portNum, args[1], l, ownDest, this, this, privateKeyFile);
                addtask(task);
                notifyEvent("clientTaskId", Integer.valueOf(task.getId()));
            } catch (IllegalArgumentException iae) {
                String msg = "Invalid I2PTunnel configuration to create an HTTP Proxy connecting to the router at " + host + ':'+ port +
-                             " and listening on " + listenHost + ':' + port;
+                             " and listening on " + listenHost + ':' + portNum;
                _log.error(getPrefix() + msg, iae);
                l.log(msg);
                notifyEvent("clientTaskId", Integer.valueOf(-1));
@ -741,7 +735,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
            String proxy = "";
            boolean isShared = true;
            if (args.length > 1) {
-                if ("true".equalsIgnoreCase(args[1].trim())) {
+                if (Boolean.valueOf(args[1].trim()).booleanValue()) {
                    isShared = true;
                    if (args.length == 3)
                        proxy = args[2];
@ -764,12 +758,12 @@ public class I2PTunnel implements Logging, EventDispatcher {
            I2PTunnelTask task;
            ownDest = !isShared;
            try {
-                task = new I2PTunnelHTTPClient(clientPort, l, ownDest, proxy, (EventDispatcher) this, this);
+                task = new I2PTunnelHTTPClient(clientPort, l, ownDest, proxy, this, this);
                addtask(task);
                notifyEvent("httpclientTaskId", Integer.valueOf(task.getId()));
            } catch (IllegalArgumentException iae) {
                String msg = "Invalid I2PTunnel configuration to create an HTTP Proxy connecting to the router at " + host + ':'+ port +
-                             " and listening on " + listenHost + ':' + port;
+                             " and listening on " + listenHost + ':' + clientPort;
                _log.error(getPrefix() + msg, iae);
                l.log(msg);
                notifyEvent("httpclientTaskId", Integer.valueOf(-1));
@ -810,7 +804,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
            String proxy = "";
            boolean isShared = true;
            if (args.length > 1) {
-                if ("true".equalsIgnoreCase(args[1].trim())) {
+                if (Boolean.valueOf(args[1].trim()).booleanValue()) {
                    isShared = true;
                    if (args.length == 3)
                        proxy = args[2];
@ -833,11 +827,11 @@ public class I2PTunnel implements Logging, EventDispatcher {
            I2PTunnelTask task;
            ownDest = !isShared;
            try {
-                task = new I2PTunnelConnectClient(_port, l, ownDest, proxy, (EventDispatcher) this, this);
+                task = new I2PTunnelConnectClient(_port, l, ownDest, proxy, this, this);
                addtask(task);
            } catch (IllegalArgumentException iae) {
                String msg = "Invalid I2PTunnel configuration to create a CONNECT client connecting to the router at " + host + ':'+ port +
-                             " and listening on " + listenHost + ':' + port;
+                             " and listening on " + listenHost + ':' + _port;
                _log.error(getPrefix() + msg, iae);
                l.log(msg);
                // Since nothing listens to TaskID events, use this to propagate the error to TunnelController
@ -881,7 +875,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
            
            boolean isShared = true;
            if (args.length > 2) {
-                if ("true".equalsIgnoreCase(args[2].trim())) {
+                if (Boolean.valueOf(args[2].trim()).booleanValue()) {
                    isShared = true;
                } else if ("false".equalsIgnoreCase(args[2].trim())) {
                    _log.warn("args[2] == [" + args[2] + "] and rejected explicitly");
@ -898,12 +892,12 @@ public class I2PTunnel implements Logging, EventDispatcher {
                String privateKeyFile = null;
                if (args.length >= 4)
                    privateKeyFile = args[3];
-                task = new I2PTunnelIRCClient(_port, args[1], l, ownDest, (EventDispatcher) this, this, privateKeyFile);
+                task = new I2PTunnelIRCClient(_port, args[1], l, ownDest, this, this, privateKeyFile);
                addtask(task);
                notifyEvent("ircclientTaskId", Integer.valueOf(task.getId()));
            } catch (IllegalArgumentException iae) {
                String msg = "Invalid I2PTunnel configuration to create an IRC client connecting to the router at " + host + ':'+ port +
-                             " and listening on " + listenHost + ':' + port;
+                             " and listening on " + listenHost + ':' + _port;
                _log.error(getPrefix() + msg, iae);
                l.log(msg);
                notifyEvent("ircclientTaskId", Integer.valueOf(-1));
@ -948,16 +942,16 @@ public class I2PTunnel implements Logging, EventDispatcher {

            boolean isShared = false;
            if (args.length > 1)
-                isShared = "true".equalsIgnoreCase(args[1].trim());
+                isShared = Boolean.valueOf(args[1].trim()).booleanValue();

            ownDest = !isShared;
            try {
-                I2PTunnelTask task = new I2PSOCKSTunnel(_port, l, ownDest, (EventDispatcher) this, this, null);
+                I2PTunnelTask task = new I2PSOCKSTunnel(_port, l, ownDest, this, this, null);
                addtask(task);
                notifyEvent("sockstunnelTaskId", Integer.valueOf(task.getId()));
            } catch (IllegalArgumentException iae) {
                String msg = "Invalid I2PTunnel configuration to create a SOCKS Proxy connecting to the router at " + host + ':'+ port +
-                             " and listening on " + listenHost + ':' + port;
+                             " and listening on " + listenHost + ':' + _port;
                _log.error(getPrefix() + msg, iae);
                l.log(msg);
                notifyEvent("sockstunnelTaskId", Integer.valueOf(-1));
@ -992,19 +986,19 @@ public class I2PTunnel implements Logging, EventDispatcher {

            boolean isShared = false;
            if (args.length == 2)
-                isShared = "true".equalsIgnoreCase(args[1].trim());
+                isShared = Boolean.valueOf(args[1].trim()).booleanValue();

            ownDest = !isShared;
            String privateKeyFile = null;
            if (args.length == 3)
                privateKeyFile = args[2];
            try {
-                I2PTunnelTask task = new I2PSOCKSIRCTunnel(_port, l, ownDest, (EventDispatcher) this, this, privateKeyFile);
+                I2PTunnelTask task = new I2PSOCKSIRCTunnel(_port, l, ownDest, this, this, privateKeyFile);
                addtask(task);
                notifyEvent("sockstunnelTaskId", Integer.valueOf(task.getId()));
            } catch (IllegalArgumentException iae) {
                String msg = "Invalid I2PTunnel configuration to create a SOCKS IRC Proxy connecting to the router at " + host + ':'+ port +
-                             " and listening on " + listenHost + ':' + port;
+                             " and listening on " + listenHost + ':' + _port;
                _log.error(getPrefix() + msg, iae);
                l.log(msg);
                notifyEvent("sockstunnelTaskId", Integer.valueOf(-1));
@ -1048,13 +1042,13 @@ public class I2PTunnel implements Logging, EventDispatcher {
                throw new IllegalArgumentException(getPrefix() + "Bad port " + args[0]);

            try {
-                StreamrConsumer task = new StreamrConsumer(_host, _port, args[2], l, (EventDispatcher) this, this);
+                StreamrConsumer task = new StreamrConsumer(_host, _port, args[2], l, this, this);
                task.startRunning();
                addtask(task);
                notifyEvent("streamrtunnelTaskId", Integer.valueOf(task.getId()));
            } catch (IllegalArgumentException iae) {
                String msg = "Invalid I2PTunnel configuration to create a Streamr Client connecting to the router at " + host + ':'+ port +
-                             " and sending to " + _host + ':' + port;
+                             " and sending to " + _host + ':' + _port;
                _log.error(getPrefix() + msg, iae);
                l.log(msg);
                notifyEvent("streamrtunnnelTaskId", Integer.valueOf(-1));
@ -1097,7 +1091,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
                return;
            }

-            StreamrProducer task = new StreamrProducer(_port, privKeyFile, args[1], l, (EventDispatcher) this, this);
+            StreamrProducer task = new StreamrProducer(_port, privKeyFile, args[1], l, this, this);
            task.startRunning();
            addtask(task);
            notifyEvent("streamrtunnelTaskId", Integer.valueOf(task.getId()));
@ -1110,13 +1104,14 @@ public class I2PTunnel implements Logging, EventDispatcher {

    /**
     * Specify the i2cp host and port 
+     * Deprecated - only used by CLI
     *
     * Sets the event "configResult" = "ok" or "error" after the configuration has been specified
     *
     * @param args {hostname, portNumber}
     * @param l logger to receive events and output
     */
-    public void runConfig(String args[], Logging l) {
+    private void runConfig(String args[], Logging l) {
        if (args.length == 2) {
            host = args[0];
            listenHost = host;
@ -1131,13 +1126,14 @@ public class I2PTunnel implements Logging, EventDispatcher {

    /**
     * Specify whether to use its own destination for each outgoing tunnel
+     * Deprecated - only used by CLI
     *
     * Sets the event "owndestResult" = "ok" or "error" after the configuration has been specified
     *
     * @param args {yes or no}
     * @param l logger to receive events and output
     */
-    public void runOwnDest(String args[], Logging l) {
+    private void runOwnDest(String args[], Logging l) {
        if (args.length == 1 && (args[0].equalsIgnoreCase("yes") || args[0].equalsIgnoreCase("no"))) {
            ownDest = args[0].equalsIgnoreCase("yes");
            notifyEvent("owndestResult", "ok");
@ -1193,21 +1189,22 @@ public class I2PTunnel implements Logging, EventDispatcher {

    /**
     * Generate a new keypair
+     * Deprecated - only used by CLI
     *
     * Sets the event "genkeysResult" = "ok" or "error" after the generation is complete
     *
     * @param args {privateKeyFilename, publicKeyFilename} or {privateKeyFilename}
     * @param l logger to receive events and output
     */
-    public void runGenKeys(String args[], Logging l) {
+    private static void runGenKeys(String args[], Logging l) {
        OutputStream pubdest = null;
        if (args.length == 2) {
            try {
                pubdest = new FileOutputStream(args[1]);
            } catch (IOException ioe) {
                l.log("Error opening output stream");
-                _log.error(getPrefix() + "Error generating keys to out", ioe);
-                notifyEvent("genkeysResult", "error");
+                //_log.error(getPrefix() + "Error generating keys to out", ioe);
+                //notifyEvent("genkeysResult", "error");
                return;
            }
        } else if (args.length != 1) {
@ -1215,7 +1212,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
            l.log("   creates a new keypair and prints the public key.\n"
                  + "   if pubkeyfile is given, saves the public key there." + "\n"
                  + "   if the privkeyfile already exists, just print/save" + "the pubkey.");
-            notifyEvent("genkeysResult", "error");
+            //notifyEvent("genkeysResult", "error");
        }
        try {
            File privKeyFile = new File(args[0]);
@ -1225,66 +1222,64 @@ public class I2PTunnel implements Logging, EventDispatcher {
            } else {
                makeKey(new FileOutputStream(privKeyFile), pubdest, l);
            }
-            notifyEvent("genkeysResult", "ok");
+            //notifyEvent("genkeysResult", "ok");
        } catch (IOException ioe) {
            l.log("Error generating keys - " + ioe.getMessage());
-            notifyEvent("genkeysResult", "error");
-            _log.error(getPrefix() + "Error generating keys", ioe);
+            //notifyEvent("genkeysResult", "error");
+            //_log.error(getPrefix() + "Error generating keys", ioe);
        }
    }

    /**
     * Generate a new keypair
+     * Deprecated - only used by CLI
     *
     * Sets the event "privateKey" = base64 of the privateKey stream and
     * sets the event "publicDestination" = base64 of the destination
     *
     * @param l logger to receive events and output
     */
-    public void runGenTextKeys(Logging l) {
+    private static void runGenTextKeys(Logging l) {
        ByteArrayOutputStream privkey = new ByteArrayOutputStream(512);
        ByteArrayOutputStream pubkey = new ByteArrayOutputStream(512);
        makeKey(privkey, pubkey, l);
        l.log("Private key: " + Base64.encode(privkey.toByteArray()));
-        notifyEvent("privateKey", Base64.encode(privkey.toByteArray()));
-        notifyEvent("publicDestination", Base64.encode(pubkey.toByteArray()));
+        //notifyEvent("privateKey", Base64.encode(privkey.toByteArray()));
+        //notifyEvent("publicDestination", Base64.encode(pubkey.toByteArray()));
    }

    /**
     * Exit the JVM if there are no more tasks left running.  If there are tunnels
     * running, it returns.
+     * Deprecated - only used by CLI
     *
     * Sets the event "quitResult" = "error" if there are tasks running (but if there
     * aren't, well, there's no point in setting the quitResult to "ok", now is there?)
     *
     * @param l logger to receive events and output
     */
-    public void runQuit(Logging l) {
+    private void runQuit(Logging l) {
        purgetasks(l);
-        synchronized (tasks) {
-            if (tasks.isEmpty()) {
-                System.exit(0);
-            }
+        if (tasks.isEmpty()) {
+            System.exit(0);
        }
        l.log("There are running tasks. Try 'list'.");
-        notifyEvent("quitResult", "error");
+        //notifyEvent("quitResult", "error");
    }

    /**
     * Retrieve a list of currently running tasks
+     * Deprecated - only used by CLI
     *
     * Sets the event "listDone" = "done" after dumping the tasks to
     * the logger
     *
     * @param l logger to receive events and output
     */
-    public void runList(Logging l) {
+    private void runList(Logging l) {
        purgetasks(l);
-        synchronized (tasks) {
-            for (int i = 0; i < tasks.size(); i++) {
-                I2PTunnelTask t = (I2PTunnelTask) tasks.get(i);
-                l.log("[" + t.getId() + "] " + t.toString());
-            }
+        for (I2PTunnelTask t : tasks) {
+            l.log("[" + t.getId() + "] " + t.toString());
        }
        notifyEvent("listDone", "done");
    }
@ -1313,14 +1308,8 @@ public class I2PTunnel implements Logging, EventDispatcher {
                argindex++;
            }
            if (args[argindex].equalsIgnoreCase("all")) {
-                List curTasks = null;
-                synchronized (tasks) {
-                    curTasks = new LinkedList(tasks);
-                }
-
                boolean error = false;
-                for (int i = 0; i < curTasks.size(); i++) {
-                    I2PTunnelTask t = (I2PTunnelTask) curTasks.get(i);
+                for (I2PTunnelTask t : tasks) {
                    if (!closetask(t, forced, l)) {
                        notifyEvent("closeResult", "error");
                        error = true;
@ -1345,13 +1334,14 @@ public class I2PTunnel implements Logging, EventDispatcher {

    /**
     * Run all of the commands in the given file (one command per line)
+     * Deprecated - only used by CLI
     *
     * Sets the event "runResult" = "ok" or "error" after the closing is complete
     *
     * @param args {filename}
     * @param l logger to receive events and output
     */
-    public void runRun(String args[], Logging l) {
+    private void runRun(String args[], Logging l) {
        if (args.length == 1) {
            try {
                BufferedReader br = new BufferedReader(new FileReader(args[0]));
@ -1376,13 +1366,14 @@ public class I2PTunnel implements Logging, EventDispatcher {

    /**
     * Perform a lookup of the name specified
+     * Deprecated - only used by CLI
     *
     * Sets the event "lookupResult" = base64 of the destination, or an error message 
     *
     * @param args {name}
     * @param l logger to receive events and output
     */
-    public void runLookup(String args[], Logging l) {
+    private void runLookup(String args[], Logging l) {
        if (args.length != 1) {
            l.log("lookup <name>");
            l.log("   try to resolve the name into a destination key");
@ -1406,17 +1397,18 @@ public class I2PTunnel implements Logging, EventDispatcher {

    /**
     * Start up a ping task with the specified args (currently supporting -ns, -h, -l)
+     * Deprecated - only used by CLI
     *
     * Sets the event "pingTaskId" = Integer of the taskId, or -1
     *
     * @param allargs arguments to pass to the I2Ping task
     * @param l logger to receive events and output
     */
-    public void runPing(String allargs, Logging l) {
+    private void runPing(String allargs, Logging l) {
        if (allargs.length() != 0) {
            I2PTunnelTask task;
            // pings always use the main destination
-            task = new I2Ping(allargs, l, false, (EventDispatcher) this, this);
+            task = new I2Ping(allargs, l, false, this, this);
            addtask(task);
            notifyEvent("pingTaskId", Integer.valueOf(task.getId()));
        } else {
@ -1442,9 +1434,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
        boolean closed = false;

        _log.debug(getPrefix() + "closetask(): looking for task " + num);
-        synchronized (tasks) {
-            for (Iterator it = tasks.iterator(); it.hasNext();) {
-                I2PTunnelTask t = (I2PTunnelTask) it.next();
+            for (I2PTunnelTask t : tasks) {
                int id = t.getId();
                if (_log.shouldLog(Log.DEBUG))
                    _log.debug(getPrefix() + "closetask(): parsing task " + id + " (" + t.toString() + ")");
@ -1454,7 +1444,6 @@ public class I2PTunnel implements Logging, EventDispatcher {
                } else if (id > num) {
                    break;
                }
-            }
        }
        return closed;
    }
@ -1482,15 +1471,14 @@ public class I2PTunnel implements Logging, EventDispatcher {
     *
     */
    private void purgetasks(Logging l) {
-        synchronized (tasks) {
-            for (Iterator it = tasks.iterator(); it.hasNext();) {
-                I2PTunnelTask t = (I2PTunnelTask) it.next();
+            List<I2PTunnelTask> removed = new ArrayList();
+            for (I2PTunnelTask t : tasks) {
                if (!t.isOpen()) {
                    _log.debug(getPrefix() + "Purging inactive tunnel: [" + t.getId() + "] " + t.toString());
-                    it.remove();
+                    removed.add(t);
                }
            }
-        }
+            tasks.removeAll(removed);
    }

    /**
@ -1511,7 +1499,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
     * @param pubDest location to store the destination
     * @param l logger to send messages to
     */
-    public static void makeKey(OutputStream writeTo, OutputStream pubDest, Logging l) {
+    private static void makeKey(OutputStream writeTo, OutputStream pubDest, Logging l) {
        try {
            l.log("Generating new keys...");
            I2PClient client = I2PClientFactory.createClient();
@ -1536,7 +1524,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
     * @param pubDest stream to write the destination to
     * @param l logger to send messages to
     */
-    public static void showKey(InputStream readFrom, OutputStream pubDest, Logging l) {
+    private static void showKey(InputStream readFrom, OutputStream pubDest, Logging l) {
        try {
            Destination d = new Destination();
            d.readBytes(readFrom);
@ -1657,41 +1645,4 @@ public class I2PTunnel implements Logging, EventDispatcher {
    public interface ConnectionEventListener {
        public void routerDisconnected();
    }
-
-    /* Required by the EventDispatcher interface */
-    public EventDispatcher getEventDispatcher() {
-        return _event;
-    }
-
-    public void attachEventDispatcher(EventDispatcher e) {
-        _event.attachEventDispatcher(e.getEventDispatcher());
-    }
-
-    public void detachEventDispatcher(EventDispatcher e) {
-        _event.detachEventDispatcher(e.getEventDispatcher());
-    }
-
-    public void notifyEvent(String e, Object a) {
-        _event.notifyEvent(e, a);
-    }
-
-    public Object getEventValue(String n) {
-        return _event.getEventValue(n);
-    }
-
-    public Set getEvents() {
-        return _event.getEvents();
-    }
-
-    public void ignoreEvents() {
-        _event.ignoreEvents();
-    }
-
-    public void unIgnoreEvents() {
-        _event.unIgnoreEvents();
-    }
-
-    public Object waitEventValue(String n) {
-        return _event.waitEventValue(n);
-    }
 }
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java
@ -9,7 +9,6 @@ import java.util.List;
 import java.util.StringTokenizer;

 import net.i2p.client.streaming.I2PSocket;
-import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
 import net.i2p.util.EventDispatcher;
 import net.i2p.util.Log;
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
@ -14,10 +14,8 @@ import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
-import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.RejectedExecutionException;
@ -36,8 +34,6 @@ import net.i2p.data.Destination;
 import net.i2p.util.EventDispatcher;
 import net.i2p.util.I2PAppThread;
 import net.i2p.util.Log;
-import net.i2p.util.SimpleScheduler;
-import net.i2p.util.SimpleTimer;

 public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runnable {

@ -51,7 +47,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
    protected long _clientId;
    protected final Object sockLock = new Object(); // Guards sockMgr and mySockets
    protected I2PSocketManager sockMgr; // should be final and use a factory. LINT
-    protected List mySockets = new ArrayList();
+    protected final List<I2PSocket> mySockets = new ArrayList();
    protected boolean _ownDest;

    protected Destination dest = null;
@ -59,7 +55,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna

    private boolean listenerReady = false;

-    private ServerSocket ss;
+    protected ServerSocket ss;

    private final Object startLock = new Object();
    private boolean startRunning = false;
@ -68,7 +64,6 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna

    // private byte[] pubkey;

-    private String handlerName;
    private String privKeyFile;

    // true if we are chained from a server.
@ -83,12 +78,17 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
     *  Extending classes may use it for other purposes.
     *  Not for use by servers, as there is no limit on threads.
     */
-    static final Executor _executor;
+    private static volatile ThreadPoolExecutor _executor;
    private static int _executorThreadCount;
-    static {
-        _executor = new CustomThreadPoolExecutor();
-    }
+    private static final Object _executorLock = new Object();

+    /**
+     *  This constructor always starts the tunnel (ignoring the i2cp.delayOpen option).
+     *  It is used to add a client to an existing socket manager.
+     *
+     *  @param localPort if 0, use any port, get actual port selected with getLocalPort()
+     *  @param sktMgr the existing socket manager
+     */
    public I2PTunnelClientBase(int localPort, Logging l, I2PSocketManager sktMgr,
            I2PTunnel tunnel, EventDispatcher notifyThis, long clientId )
            throws IllegalArgumentException {
@ -98,7 +98,6 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
        _clientId = clientId;
        this.localPort = localPort;
        this.l = l;
-        this.handlerName = localPort + " #" + _clientId;
        _ownDest = true; // == ! shared client
        _context = tunnel.getContext();
        _context.statManager().createRateStat("i2ptunnel.client.closeBacklog", "How many pending sockets remain when we close one due to backlog?", "I2PTunnel", new long[] { 60*1000, 10*60*1000, 60*60*1000 });
@ -107,8 +106,12 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
        _context.statManager().createRateStat("i2ptunnel.client.buildRunTime", "How long it takes to run a queued socket into an i2ptunnel runner?", "I2PTunnel", new long[] { 60*1000, 10*60*1000, 60*60*1000 });
        _log = _context.logManager().getLog(getClass());

+        synchronized (_executorLock) {
+            if (_executor == null)
+                _executor = new CustomThreadPoolExecutor();
+        }
+
        Thread t = new I2PAppThread(this, "Client " + tunnel.listenHost + ':' + localPort);
-        listenerReady = false;
        t.start();
        open = true;
        synchronized (this) {
@ -130,6 +133,14 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
        }
    }

+    /**
+     * The main constructor.
+     * This may take a LONG time if building and starting a new manager.
+     *
+     * @param localPort if 0, use any port, get actual port selected with getLocalPort()
+     * @throws IllegalArgumentException if the I2CP configuration is b0rked so
+     *                                  badly that we can't create a socketManager
+     */
    public I2PTunnelClientBase(int localPort, boolean ownDest, Logging l, 
                               EventDispatcher notifyThis, String handlerName, 
                               I2PTunnel tunnel) throws IllegalArgumentException {
@ -137,10 +148,14 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
    }

    /**
-     * @param pkf null to generate a transient key
+     * Use this to build a client with a persistent private key.
+     * This may take a LONG time if building and starting a new manager.
+     *
+     * @param localPort if 0, use any port, get actual port selected with getLocalPort()
+     * @param pkf Path to the private key file, or null to generate a transient key
     *
     * @throws IllegalArgumentException if the I2CP configuration is b0rked so
-     *                                  badly that we cant create a socketManager
+     *                                  badly that we can't create a socketManager
     */
    public I2PTunnelClientBase(int localPort, boolean ownDest, Logging l, 
                               EventDispatcher notifyThis, String handlerName, 
@ -149,7 +164,6 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
        _clientId = ++__clientId;
        this.localPort = localPort;
        this.l = l;
-        this.handlerName = handlerName + _clientId;
        _ownDest = ownDest; // == ! shared client


@ -160,6 +174,11 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
        _context.statManager().createRateStat("i2ptunnel.client.buildRunTime", "How long it takes to run a queued socket into an i2ptunnel runner?", "I2PTunnel", new long[] { 60*1000, 10*60*1000, 60*60*1000 });
        _log = _context.logManager().getLog(getClass());

+        synchronized (_executorLock) {
+            if (_executor == null)
+                _executor = new CustomThreadPoolExecutor();
+        }
+
        // normalize path so we can find it
        if (pkf != null) {
            File keyFile = new File(pkf);
@ -170,7 +189,10 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna

        // no need to load the netDb with leaseSets for destinations that will never 
        // be looked up
-        tunnel.getClientOptions().setProperty("i2cp.dontPublishLeaseSet", "true");
+        boolean dccEnabled = (this instanceof I2PTunnelIRCClient) &&
+                      Boolean.valueOf(tunnel.getClientOptions().getProperty(I2PTunnelIRCClient.PROP_DCC)).booleanValue();
+        if (!dccEnabled)
+            tunnel.getClientOptions().setProperty("i2cp.dontPublishLeaseSet", "true");
        
        boolean openNow = !Boolean.valueOf(tunnel.getClientOptions().getProperty("i2cp.delayOpen")).booleanValue();
        if (openNow) {
@ -183,17 +205,17 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
                    try { Thread.sleep(10*1000); } catch (InterruptedException ie) {}
                }
            }
-            if (sockMgr == null) {
-                l.log("Invalid I2CP configuration");
-                throw new IllegalArgumentException("Socket manager could not be created");
-            }
+            // can't be null unless we limit the loop above
+            //if (sockMgr == null) {
+            //    l.log("Invalid I2CP configuration");
+            //    throw new IllegalArgumentException("Socket manager could not be created");
+            //}
            l.log("Tunnels ready for client: " + handlerName);

        } // else delay creating session until createI2PSocket() is called
        
        Thread t = new I2PAppThread(this);
        t.setName("Client " + _clientId);
-        listenerReady = false;
        t.start();
        open = true;
        synchronized (this) {
@ -219,7 +241,8 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
    }
    
    /**
-     * Sets the this.sockMgr field if it is null, or if we want a new one
+     * Sets the this.sockMgr field if it is null, or if we want a new one.
+     * This may take a LONG time if building a new manager.
     *
     * We need a socket manager before getDefaultOptions() and most other things
     * @throws IllegalArgumentException if the I2CP configuration is b0rked so
@ -258,27 +281,33 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna


    /**
-     * this is ONLY for shared clients
+     * This is ONLY for shared clients.
+     * This may take a LONG time if building a new manager.
+     *
     * @return non-null
     * @throws IllegalArgumentException if the I2CP configuration is b0rked so
     *                                  badly that we cant create a socketManager
     */
-    protected synchronized I2PSocketManager getSocketManager() {
+    protected I2PSocketManager getSocketManager() {
        return getSocketManager(getTunnel(), this.privKeyFile);
    }

    /**
-     * this is ONLY for shared clients
+     * This is ONLY for shared clients.
+     * This may take a LONG time if building a new manager.
+     *
     * @return non-null
     * @throws IllegalArgumentException if the I2CP configuration is b0rked so
     *                                  badly that we cant create a socketManager
     */
-    protected static synchronized I2PSocketManager getSocketManager(I2PTunnel tunnel) {
+    protected static I2PSocketManager getSocketManager(I2PTunnel tunnel) {
        return getSocketManager(tunnel, null);
    }

    /**
-     * this is ONLY for shared clients
+     * This is ONLY for shared clients.
+     * This may take a LONG time if building a new manager.
+     *
     * @return non-null
     * @throws IllegalArgumentException if the I2CP configuration is b0rked so
     *                                  badly that we cant create a socketManager
@ -293,6 +322,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
                    _log.info(tunnel.getClientOptions().getProperty("inbound.nickname") + ": Building a new socket manager since the old one closed [s=" + s + "]");
                if (s != null)
                    tunnel.removeSession(s);
+                // We could be here a LONG time, holding the lock
                socketManager = buildSocketManager(tunnel, pkf);
            } else {
                if (_log.shouldLog(Log.INFO))
@ -307,6 +337,8 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
    }

    /**
+     * This may take a LONG time.
+     *
     * @return non-null
     * @throws IllegalArgumentException if the I2CP configuration is b0rked so
     *                                  badly that we cant create a socketManager
@ -315,6 +347,8 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
        return buildSocketManager(getTunnel(), this.privKeyFile, this.l);
    }
    /**
+     * This may take a LONG time.
+     *
     * @return non-null
     * @throws IllegalArgumentException if the I2CP configuration is b0rked so
     *                                  badly that we cant create a socketManager
@ -327,6 +361,8 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
    private static final int MAX_RETRIES = 4;

    /**
+     * This may take a LONG time.
+     *
     * @param pkf absolute path or null
     * @return non-null
     * @throws IllegalArgumentException if the I2CP configuration is b0rked so
@ -337,6 +373,8 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
    }

    /**
+     * This may take a LONG time.
+     *
     * @param pkf absolute path or null
     * @return non-null
     * @throws IllegalArgumentException if the I2CP configuration is b0rked so
@ -357,7 +395,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
        }
        
        I2PSocketManager sockManager = null;
-        // Todo: Can't stop a tunnel from the UI while it's in this loop (no session yet)
+        // FIXME: Can't stop a tunnel from the UI while it's in this loop (no session yet)
        int retries = 0;
        while (sockManager == null) {
            if (pkf != null) {
@ -512,7 +550,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
            if (localPort == 0) {
                localPort = ss.getLocalPort();
            }
-            notifyEvent("clientLocalPort", new Integer(ss.getLocalPort()));
+            notifyEvent("clientLocalPort", Integer.valueOf(ss.getLocalPort()));
            // duplicates message in constructor
            //l.log("Listening for clients on port " + localPort + " of " + getTunnel().listenHost);

@ -551,6 +589,30 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
        }
    }

+    /**
+     *  @return may be null if no class has been instantiated
+     *  @since 0.8.8
+     */
+    static ThreadPoolExecutor getClientExecutor() {
+        return _executor;
+    }
+
+    /**
+     *  @since 0.8.8
+     */
+    static void killClientExecutor() {
+        synchronized (_executorLock) {
+            if (_executor != null) {
+                _executor.setRejectedExecutionHandler(new ThreadPoolExecutor.DiscardPolicy());
+                _executor.shutdownNow();
+                _executor = null;
+            }
+            // kill the shared client, so that on restart in android
+            // we won't latch onto the old one
+            socketManager = null;
+        }
+    }
+
    /**
     * Manage the connection just opened on the specified socket
     *
@ -558,8 +620,16 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
     */
    protected void manageConnection(Socket s) {
        if (s == null) return;
+        ThreadPoolExecutor tpe = _executor;
+        if (tpe == null) {
+            _log.error("No executor for socket!");
+             try {
+                 s.close();
+             } catch (IOException ioe) {}
+            return;
+        }
        try {
-            _executor.execute(new BlockingRunner(s));
+            tpe.execute(new BlockingRunner(s));
        } catch (RejectedExecutionException ree) {
             // should never happen, we have an unbounded pool and never stop the executor
             try {
@ -610,11 +680,11 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
        synchronized (sockLock) {
            if (sockMgr != null) {
                mySockets.retainAll(sockMgr.listSockets());
-                if (!forced && mySockets.size() != 0) {
-                    l.log("There are still active connections!");
+                if ((!forced) && (!mySockets.isEmpty())) {
+                    l.log("Not closing, there are still active connections!");
                    _log.debug("can't close: there are still active connections!");
-                    for (Iterator it = mySockets.iterator(); it.hasNext();) {
-                        l.log("->" + it.next());
+                    for (I2PSocket s : mySockets) {
+                        l.log("  -> " + s.toString());
                    }
                    return false;
                }
@ -630,12 +700,12 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
            try {
                if (ss != null) ss.close();
            } catch (IOException ex) {
-                ex.printStackTrace();
+                if (_log.shouldLog(Log.WARN))
+                    _log.warn("error closing", ex);
                return false;
            }
            //l.log("Client closed.");
        }
-        
        return true;
    }

--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java
@ -9,12 +9,10 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
 import java.net.SocketException;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Locale;
 import java.util.Properties;
 import java.util.StringTokenizer;

-import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PSocketOptions;
@ -24,6 +22,7 @@ import net.i2p.data.Destination;
 import net.i2p.util.EventDispatcher;
 import net.i2p.util.FileUtil;
 import net.i2p.util.Log;
+import net.i2p.util.PortMapper;

 /**
 * Supports the following:
@ -151,6 +150,20 @@ public class I2PTunnelConnectClient extends I2PTunnelHTTPClientBase implements R
        return opts;
    }
    
+    @Override
+    public void startRunning() {
+        super.startRunning();
+        _context.portMapper().register(PortMapper.SVC_HTTPS_PROXY, getLocalPort());
+    }
+
+    @Override
+    public boolean close(boolean forced) {
+        int reg = _context.portMapper().getPort(PortMapper.SVC_HTTPS_PROXY);
+        if (reg == getLocalPort())
+            _context.portMapper().unregister(PortMapper.SVC_HTTPS_PROXY);
+        return super.close(forced);
+    }
+
    protected void clientConnectionRun(Socket s) {
        InputStream in = null;
        OutputStream out = null;
@ -163,7 +176,6 @@ public class I2PTunnelConnectClient extends I2PTunnelHTTPClientBase implements R
            in = s.getInputStream();
            String line, method = null, host = null, destination = null, restofline = null;
            StringBuilder newRequest = new StringBuilder();
-            int ahelper = 0;
            String authorization = null;
            while (true) {
                // Use this rather than BufferedReader because we can't have readahead,
@ -193,7 +205,7 @@ public class I2PTunnelConnectClient extends I2PTunnelHTTPClientBase implements R
                        restofline = request.substring(pos); // ":80 HTTP/1.1" or " HTTP/1.1"
                    }

-                    if (host.toLowerCase().endsWith(".i2p")) {
+                    if (host.toLowerCase(Locale.US).endsWith(".i2p")) {
                        // Destination gets the host name
                        destination = host;
                    } else if (host.indexOf(".") != -1) {
@ -209,7 +221,7 @@ public class I2PTunnelConnectClient extends I2PTunnelHTTPClientBase implements R
                        destination = currentProxy;
                        usingWWWProxy = true;
                        newRequest.append("CONNECT ").append(host).append(restofline).append("\r\n"); // HTTP spec
-                    } else if (host.toLowerCase().equals("localhost")) {
+                    } else if (host.toLowerCase(Locale.US).equals("localhost")) {
                        writeErrorMessage(ERR_LOCALHOST, out);
                        s.close();
                        return;
@ -224,7 +236,7 @@ public class I2PTunnelConnectClient extends I2PTunnelHTTPClientBase implements R
                        _log.debug(getPrefix(requestId) + "REST  :" + restofline + ":");
                        _log.debug(getPrefix(requestId) + "DEST  :" + destination + ":");
                    }
-                } else if (line.toLowerCase().startsWith("proxy-authorization: basic ")) {
+                } else if (line.toLowerCase(Locale.US).startsWith("proxy-authorization: basic ")) {
                    // strip Proxy-Authenticate from the response in HTTPResponseOutputStream
                    // save for auth check below
                    authorization = line.substring(27);  // "proxy-authorization: basic ".length()
@ -261,7 +273,7 @@ public class I2PTunnelConnectClient extends I2PTunnelHTTPClientBase implements R
                }
            }

-            if (destination == null || !"CONNECT".equalsIgnoreCase(method)) {
+            if (destination == null || method == null || !"CONNECT".equals(method.toUpperCase(Locale.US))) {
                writeErrorMessage(ERR_BAD_PROTOCOL, out);
                s.close();
                return;
@ -305,7 +317,8 @@ public class I2PTunnelConnectClient extends I2PTunnelHTTPClientBase implements R
            else
                response = SUCCESS_RESPONSE;
            Runnable onTimeout = new OnTimeout(s, s.getOutputStream(), targetRequest, usingWWWProxy, currentProxy, requestId);
-            I2PTunnelRunner runner = new I2PTunnelRunner(s, i2ps, sockLock, data, response, mySockets, onTimeout);
+            // starts itself
+            new I2PTunnelRunner(s, i2ps, sockLock, data, response, mySockets, onTimeout);
        } catch (SocketException ex) {
            _log.info(getPrefix(requestId) + "Error trying to connect", ex);
            handleConnectClientException(ex, out, targetRequest, usingWWWProxy, currentProxy, requestId);
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPBidirServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPBidirServer.java
@ -8,7 +8,6 @@ import java.io.InputStream;
 import java.net.InetAddress;

 import net.i2p.util.EventDispatcher;
-import net.i2p.util.Log;

 public class I2PTunnelHTTPBidirServer extends I2PTunnelHTTPServer {

--- a/Show More
+++ b/Show More