0.8

and 'a24bf3a898b6310d05bf2ee9ce99b3a52f067205'

INSTALL-headless.txt

@@ -27,6 +27,7 @@ run I2P for the first time.
 To run I2P explicitly:
    (*nix): sh i2prouter start
    (win*): I2P.exe
+   (Platforms unsupported by the wrapper - PPC, ARM, etc): sh runplain.sh
 
 To stop the router (gracefully):
    lynx http://localhost:7657/configservice.jsp ("Shutdown gracefully")

INSTALL.txt

@@ -2,6 +2,7 @@ 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)
 	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/

LICENSE.txt

@@ -64,6 +64,9 @@ Public domain except as listed below:
    Copyright 2006 Gregory Rubin grrubin@gmail.com
    See licenses/LICENSE-HashCash.txt
 
+   GettextResource from gettext v0.18:
+   Copyright (C) 2001, 2007 Free Software Foundation, Inc.
+   See licenses/LICENSE-LGPLv2.1.txt
 
 
 Router:
@@ -139,6 +142,7 @@ Applications:
    I2PSnark:
    Copyright (C) 2003 Mark J. Wielaard
    See licenses/LICENSE-GPLv2.txt
+       Silk icons: See licenses/LICENSE-SilkIcons.txt
 
    I2PTunnel:
    (c) 2003 - 2004 mihi
@@ -176,6 +180,7 @@ Applications:
    Router console:
    Public domain.
        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.

README.txt

@@ -1,5 +1,6 @@
 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)
 	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/

android/src/net/i2p/router/I2PAndroid.java

@@ -69,7 +69,7 @@ public class I2PAndroid extends Activity
 
         // from routerconsole ContextHelper
         List contexts = RouterContext.listContexts();
-        if ( (contexts == null) || (contexts.size() <= 0) ) 
+        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);
 

apps/BOB/nbproject/private/private.properties

@@ -1,8 +0,0 @@
-compile.on.save=false
-do.depend=false
-do.jar=true
-javac.debug=true
-javadoc.preview=true
-jaxbwiz.endorsed.dirs=/usr/local/netbeans-6.8/ide12/modules/ext/jaxb/api
-jaxws.endorsed.dir=/usr/local/netbeans-6.5/java2/modules/ext/jaxws21/api:/usr/local/netbeans-6.5/ide10/modules/ext/jaxb/api
-user.properties.file=/root/.netbeans/6.5/build.properties

apps/BOB/nbproject/private/private.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
-    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-</project-private>

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

@@ -50,7 +50,7 @@ public class DoCMDS implements Runnable {
 
 	// FIX ME
 	// I need a better way to do versioning, but this will do for now.
-	public static final String BMAJ = "00",  BMIN = "00",  BREV = "0B",  BEXT = "";
+	public static final String BMAJ = "00",  BMIN = "00",  BREV = "0D",  BEXT = "";
 	public static final String BOBversion = BMAJ + "." + BMIN + "." + BREV + BEXT;
 	private Socket server;
 	private Properties props;

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

@@ -311,6 +311,19 @@ public class MUXlisten implements Runnable {
 			} catch (InterruptedException ex) {
 			}
 
+			// Hopefully nuke stuff here...
+			{
+				String boner = tg.getName();
+				try {
+					_log.warn("destroySocketManager " + boner);
+					socketManager.destroySocketManager();
+					_log.warn("destroySocketManager Successful" + boner);
+				} catch (Exception e) {
+					// nop
+					_log.warn("destroySocketManager Failed" + boner);
+					_log.warn(e.toString());
+				}
+			}
 			// zero out everything.
 			try {
 				wlock();

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

@@ -95,10 +95,14 @@ public class TCPio implements Runnable {
 					if (b > 0) {
 						Aout.write(a, 0, b);
 					} else if (b == 0) {
-						Thread.yield(); // this should act like a mini sleep.
-						if (Ain.available() == 0) {
-							Thread.sleep(10);
+// Will this die? We'll see.
+						while(Ain.available() == 0) {
+							Thread.sleep(20);
 						}
+//						Thread.yield(); // this should act like a mini sleep.
+//						if (Ain.available() == 0) {
+//							Thread.sleep(10);
+//						}
 					} else {
 						/* according to the specs:
 						 *

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

@@ -39,6 +39,7 @@ import net.i2p.I2PAppContext;
 public class Daemon {
     public static final String VERSION = "2.0.3";
     private static final Daemon _instance = new Daemon();
+    private boolean _running;
     
     /**
      * Update the router and published address books using remote data from the
@@ -126,6 +127,7 @@ public class Daemon {
     }
     
     public void run(String[] args) {
+        _running = true;
         String settingsLocation = "config.txt";
         File homeFile;
         if (args.length > 0) {
@@ -166,7 +168,7 @@ public class Daemon {
 	    // Static method, and redundent Thread.currentThread().sleep(5*60*1000);
         } catch (InterruptedException ie) {}
         
-        while (true) {
+        while (_running) {
             long delay = Long.parseLong((String) settings.get("update_delay"));
             if (delay < 1) {
                 delay = 1;
@@ -179,6 +181,8 @@ public class Daemon {
                 }
             } catch (InterruptedException exp) {
             }
+            if (!_running)
+                break;
             settings = ConfigParser.parse(settingsFile, defaultSettings);
         }
     }
@@ -192,4 +196,9 @@ public class Daemon {
             _instance.notifyAll();
         }
     }
+
+    public static void stop() {
+        _instance._running = false;
+        wakeup();
+    }
 }

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

@@ -51,4 +51,9 @@ public class DaemonThread extends Thread {
         //}
         Daemon.main(this.args);
     }
-}
+
+    public void halt() {
+        Daemon.stop();
+        interrupt();
+    }
+}

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

@@ -41,7 +41,7 @@ import javax.servlet.http.HttpServletResponse;
  *
  */
 public class Servlet extends HttpServlet {
-    private Thread thread;
+    private DaemonThread thread;
     private String nonce;
     private static final String PROP_NONCE = "addressbook.nonce";
 
@@ -88,4 +88,9 @@ public class Servlet extends HttpServlet {
         //System.out.println("INFO: config root under " + args[0]);
     }
 
+    @Override
+    public void destroy() {
+        this.thread.halt();
+        super.destroy();
+    }
 }

apps/i2psnark/java/build.xml

@@ -52,7 +52,7 @@
           <classes dir="./build/obj" includes="**/I2PSnarkServlet*.class" />
      -->
     <target name="war" depends="jar, bundle"> 
-        <war destfile="../i2psnark.war" webxml="../web.xml">
+        <war destfile="../i2psnark.war" webxml="../web.xml" basedir="../" includes="_icons/*" >
           <!-- 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" />
         </war>
@@ -73,7 +73,7 @@
         </exec>
     </target>
 
-    <target name="poupdate" depends="compile">
+    <target name="poupdate" depends="builddep, compile">
         <!-- Update the messages_*.po files.  -->
         <exec executable="sh" osfamily="unix" failifexecutionfails="true" >
             <arg value="./bundle-messages.sh" />

apps/i2psnark/java/bundle-messages.sh

@@ -49,7 +49,7 @@ do
 		# To start a new translation, copy the header from an old translation to the new .po file,
 		# then ant distclean poupdate.
 		find $JPATHS -name *.java > $TMPFILE
-		xgettext -f $TMPFILE -F -L java --from-code=UTF-8 \
+		xgettext -f $TMPFILE -F -L java --from-code=UTF-8 --add-comments\
 	                 --keyword=_ --keyword=_x \
 		         -o ${i}t
 		if [ $? -ne 0 ]

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

@@ -25,6 +25,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
 import net.i2p.client.streaming.I2PServerSocket;
 import net.i2p.client.streaming.I2PSocket;
@@ -36,7 +37,7 @@ import net.i2p.util.Log;
  */
 public class ConnectionAcceptor implements Runnable
 {
-  private Log _log = new Log(ConnectionAcceptor.class);
+  private final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(ConnectionAcceptor.class);
   private I2PServerSocket serverSocket;
   private PeerAcceptor peeracceptor;
   private Thread thread;

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

@@ -4,7 +4,6 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -23,6 +22,7 @@ import net.i2p.client.streaming.I2PSocketManagerFactory;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
 import net.i2p.data.Hash;
+import net.i2p.util.ConcurrentHashSet;
 import net.i2p.util.EepGet;
 import net.i2p.util.FileUtil;
 import net.i2p.util.Log;
@@ -45,33 +45,35 @@ public class I2PSnarkUtil {
     private int _proxyPort;
     private String _i2cpHost;
     private int _i2cpPort;
-    private Map _opts;
+    private Map<String, String> _opts;
     private I2PSocketManager _manager;
     private boolean _configured;
-    private final Set _shitlist;
+    private final Set<Hash> _shitlist;
     private int _maxUploaders;
     private int _maxUpBW;
     private int _maxConnections;
     private File _tmpDir;
-    
+    private int _startupDelay;
+
+    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
-
     public I2PSnarkUtil(I2PAppContext ctx) {
         _context = ctx;
         _log = _context.logManager().getLog(Snark.class);
         _opts = new HashMap();
-        setProxy("127.0.0.1", 4444);
+        //setProxy("127.0.0.1", 4444);
         setI2CPConfig("127.0.0.1", 7654, null);
-        _shitlist = new HashSet(64);
+        _shitlist = new ConcurrentHashSet();
         _configured = false;
         _maxUploaders = Snark.MAX_TOTAL_UPLOADERS;
         _maxUpBW = DEFAULT_MAX_UP_BW;
         _maxConnections = MAX_CONNECTIONS;
+        _startupDelay = DEFAULT_STARTUP_DELAY;
         // This is used for both announce replies and .torrent file downloads,
         // so it must be available even if not connected to I2CP.
         // so much for multiple instances
@@ -85,6 +87,7 @@ public class I2PSnarkUtil {
      * host for no proxying)
      *
      */
+/*****
     public void setProxy(String host, int port) {
         if ( (host != null) && (port > 0) ) {
             _shouldProxy = true;
@@ -97,6 +100,7 @@ public class I2PSnarkUtil {
         }
         _configured = true;
     }
+******/
     
     public boolean configured() { return _configured; }
     
@@ -125,17 +129,23 @@ public class I2PSnarkUtil {
         _maxConnections = limit;
         _configured = true;
     }
+
+    public void setStartupDelay(int minutes) {
+	_startupDelay = minutes;
+	_configured = true;
+    }
     
     public String getI2CPHost() { return _i2cpHost; }
     public int getI2CPPort() { return _i2cpPort; }
-    public Map getI2CPOptions() { return _opts; }
+    public Map<String, String> getI2CPOptions() { return _opts; }
     public String getEepProxyHost() { return _proxyHost; }
     public int getEepProxyPort() { return _proxyPort; }
     public boolean getEepProxySet() { return _shouldProxy; }
     public int getMaxUploaders() { return _maxUploaders; }
     public int getMaxUpBW() { return _maxUpBW; }
     public int getMaxConnections() { return _maxConnections; }
-    
+    public int getStartupDelay() { return _startupDelay; }  
+  
     /**
      * Connect to the router, if we aren't already
      */
@@ -187,18 +197,15 @@ public class I2PSnarkUtil {
     /** connect to the given destination */
     I2PSocket connect(PeerID peer) throws IOException {
         Hash dest = peer.getAddress().calculateHash();
-        synchronized (_shitlist) {
-            if (_shitlist.contains(dest))
-                throw new IOException("Not trying to contact " + dest.toBase64() + ", as they are shitlisted");
-        }
+        if (_shitlist.contains(dest))
+            throw new IOException("Not trying to contact " + dest.toBase64() + ", as they are shitlisted");
         try {
             I2PSocket rv = _manager.connect(peer.getAddress());
-            if (rv != null) synchronized (_shitlist) { _shitlist.remove(dest); }
+            if (rv != null)
+                _shitlist.remove(dest);
             return rv;
         } catch (I2PException ie) {
-            synchronized (_shitlist) {
-                _shitlist.add(dest);
-            }
+            _shitlist.add(dest);
             SimpleScheduler.getInstance().addEvent(new Unshitlist(dest), 10*60*1000);
             throw new IOException("Unable to reach the peer " + peer + ": " + ie.getMessage());
         }
@@ -207,7 +214,7 @@ public class I2PSnarkUtil {
     private class Unshitlist implements SimpleTimer.TimedEvent {
         private Hash _dest;
         public Unshitlist(Hash dest) { _dest = dest; }
-        public void timeReached() { synchronized (_shitlist) { _shitlist.remove(_dest); } }
+        public void timeReached() { _shitlist.remove(_dest); }
     }
     
     /**
@@ -358,7 +365,7 @@ public class I2PSnarkUtil {
         while (tok.hasMoreTokens())
             rv.add(tok.nextToken());
         
-        if (rv.size() <= 0)
+        if (rv.isEmpty())
             return null;
         return rv;
     }
@@ -431,4 +438,9 @@ public class I2PSnarkUtil {
     public String getString(String s, Object o, Object o2) {
         return Translate.getString(s, o, o2, _context, BUNDLE_NAME);
     }
+
+    /** ngettext @since 0.7.14 */
+    public String getString(int n, String s, String p) {
+        return Translate.getString(n, s, p, _context, BUNDLE_NAME);
+    }
 }

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

@@ -30,6 +30,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import net.i2p.I2PAppContext;
 import net.i2p.crypto.SHA1;
 import net.i2p.data.Base64;
 import net.i2p.util.Log;
@@ -47,7 +48,7 @@ import org.klomp.snark.bencode.InvalidBEncodingException;
  */
 public class MetaInfo
 {  
-  private static final Log _log = new Log(MetaInfo.class);
+  private final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(MetaInfo.class);
   private final String announce;
   private final byte[] info_hash;
   private final String name;

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

@@ -388,6 +388,7 @@ public class Peer implements Comparable
    * Sets whether or not we are interested in pieces from this peer.
    * Defaults to false. When interest is true and this peer unchokes
    * us then we start downloading from it. Has no effect when not connected.
+   * @deprecated unused
    */
   public void setInteresting(boolean interest)
   {

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

@@ -28,6 +28,7 @@ import java.io.OutputStream;
 import java.io.SequenceInputStream;
 import java.util.Iterator;
 
+import net.i2p.I2PAppContext;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.data.Base64;
 import net.i2p.data.DataHelper;
@@ -41,7 +42,7 @@ import net.i2p.util.Log;
  */
 public class PeerAcceptor
 {
-  private static final Log _log = new Log(PeerAcceptor.class);
+  private final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(PeerAcceptor.class);
   private final PeerCoordinator coordinator;
   final PeerCoordinatorSet coordinators;
 

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

@@ -26,6 +26,8 @@ import java.util.List;
 import java.util.Random;
 import java.util.TimerTask;
 
+import net.i2p.I2PAppContext;
+
 /**
  * TimerTask that checks for good/bad up/downloader. Works together
  * with the PeerCoordinator to select which Peers get (un)choked.
@@ -43,7 +45,7 @@ class PeerCheckerTask extends TimerTask
     this.coordinator = coordinator;
   }
 
-  private Random random = new Random();
+  private static final Random random = I2PAppContext.getGlobalContext().random();
 
   public void run()
   {
@@ -113,7 +115,7 @@ class PeerCheckerTask extends TimerTask
                         + " C: " + peer.isChoked(),
                         Snark.DEBUG);
 
-            // Choke half of them rather than all so it isn't so drastic...
+            // Choke a percentage of them rather than all so it isn't so drastic...
             // unless this torrent is over the limit all by itself.
             boolean overBWLimitChoke = upload > 0 &&
                                        ((overBWLimit && random.nextBoolean()) ||

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

@@ -23,11 +23,12 @@ package org.klomp.snark;
 import java.io.DataInputStream;
 import java.io.IOException;
 
+import net.i2p.I2PAppContext;
 import net.i2p.util.Log;
 
 class PeerConnectionIn implements Runnable
 {
-  private Log _log = new Log(PeerConnectionIn.class);
+  private final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(PeerConnectionIn.class);
   private final Peer peer;
   private final DataInputStream din;
 
@@ -129,7 +130,7 @@ class PeerConnectionIn implements Runnable
                 din.readFully(bitmap);
                 ps.bitfieldMessage(bitmap);
                 if (_log.shouldLog(Log.DEBUG)) 
-                    _log.debug("Received bitmap from " + peer + " on " + peer.metainfo.getName() + ": size=" + (i-1) + ": " + ps.bitfield);
+                    _log.debug("Received bitmap from " + peer + " on " + peer.metainfo.getName() + ": size=" + (i-1) /* + ": " + ps.bitfield */ );
                 break;
               case 6:
                 piece = din.readInt();

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

@@ -26,6 +26,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import net.i2p.I2PAppContext;
 import net.i2p.util.I2PAppThread;
 import net.i2p.util.Log;
 import net.i2p.util.SimpleScheduler;
@@ -33,7 +34,7 @@ import net.i2p.util.SimpleTimer;
 
 class PeerConnectionOut implements Runnable
 {
-  private Log _log = new Log(PeerConnectionOut.class);
+  private final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(PeerConnectionOut.class);
   private final Peer peer;
   private final DataOutputStream dout;
 
@@ -141,7 +142,7 @@ class PeerConnectionOut implements Runnable
                             it.remove();
                           }
                       }
-                    if (m == null && sendQueue.size() > 0) {
+                    if (m == null && !sendQueue.isEmpty()) {
                       m = (Message)sendQueue.remove(0);
                       SimpleTimer.getInstance().removeEvent(m.expireEvent);
                     }
@@ -163,10 +164,22 @@ class PeerConnectionOut implements Runnable
                   removeMessage(Message.PIECE);
 
                 // XXX - Should also register overhead...
-                if (m.type == Message.PIECE)
-                  state.uploaded(m.len);
+                // Don't let other clients requesting big chunks get an advantage
+                // when we are seeding;
+                // only count the rest of the upload after sendMessage().
+                int remainder = 0;
+                if (m.type == Message.PIECE) {
+                  if (m.len <= PeerState.PARTSIZE) {
+                     state.uploaded(m.len);
+                  } else {
+                     state.uploaded(PeerState.PARTSIZE);
+                     remainder = m.len - PeerState.PARTSIZE;
+                  }
+                }
 
                 m.sendMessage(dout);
+                if (remainder > 0)
+                  state.uploaded(remainder);
                 m = null;
               }
           }

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

@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Random;
 import java.util.Timer;
 
+import net.i2p.I2PAppContext;
 import net.i2p.util.I2PAppThread;
 import net.i2p.util.Log;
 
@@ -37,7 +38,7 @@ import net.i2p.util.Log;
  */
 public class PeerCoordinator implements PeerListener
 {
-  private final Log _log = new Log(PeerCoordinator.class);
+  private final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(PeerCoordinator.class);
   final MetaInfo metainfo;
   final Storage storage;
   final Snark snark;
@@ -61,7 +62,7 @@ public class PeerCoordinator implements PeerListener
   private long downloaded_old[] = {-1,-1,-1,-1,-1,-1};
 
   // synchronize on this when changing peers or downloaders
-  final List peers = new ArrayList();
+  final List<Peer> peers = new ArrayList();
   /** estimate of the peers, without requiring any synchronization */
   volatile int peerCount;
 
@@ -71,7 +72,7 @@ public class PeerCoordinator implements PeerListener
   private final byte[] id;
 
   // Some random wanted pieces
-  private List wantedPieces;
+  private List<Piece> wantedPieces;
 
   private boolean halted = false;
 
@@ -96,7 +97,7 @@ public class PeerCoordinator implements PeerListener
     // Install a timer to check the uploaders.
     // Randomize the first start time so multiple tasks are spread out,
     // this will help the behavior with global limits
-    Random r = new Random();
+    Random r = I2PAppContext.getGlobalContext().random();
     timer.schedule(new PeerCheckerTask(_util, this), (CHECK_PERIOD / 2) + r.nextInt((int) CHECK_PERIOD), CHECK_PERIOD);
   }
   
@@ -116,7 +117,7 @@ public class PeerCoordinator implements PeerListener
   public CoordinatorListener getListener() { return listener; }
 
   // for web page detailed stats
-  public List peerList()
+  public List<Peer> peerList()
   {
     synchronized(peers)
       {
@@ -134,8 +135,10 @@ public class PeerCoordinator implements PeerListener
     return storage.complete();
   }
 
+  /** might be wrong */
   public int getPeerCount() { return peerCount; }
 
+  /** should be right */
   public int getPeers()
   {
     synchronized(peers)
@@ -240,15 +243,18 @@ public class PeerCoordinator implements PeerListener
       }
   }
   
-  /** reduce max if huge pieces to keep from ooming */
+  /**
+   *  Reduce max if huge pieces to keep from ooming when leeching
+   *  @return 512K: 16; 1M: 11; 2M: 6
+   */
   private int getMaxConnections() {
     int size = metainfo.getPieceLength(0);
     int max = _util.getMaxConnections();
-    if (size <= 1024*1024)
+    if (size <= 512*1024 || completed())
       return max;
-    if (size <= 2*1024*1024)
-      return (max + 1) / 2;
-    return (max + 3) / 4;
+    if (size <= 1024*1024)
+      return (max + max + 2) / 3;
+    return (max + 2) / 3;
   }
 
   public boolean halted() { return halted; }
@@ -256,7 +262,7 @@ public class PeerCoordinator implements PeerListener
   public void halt()
   {
     halted = true;
-    List removed = new ArrayList();
+    List<Peer> removed = new ArrayList();
     synchronized(peers)
       {
         // Stop peer checker task.
@@ -268,8 +274,8 @@ public class PeerCoordinator implements PeerListener
         peerCount = 0;
       }
 
-    while (removed.size() > 0) {
-        Peer peer = (Peer)removed.remove(0);
+    while (!removed.isEmpty()) {
+        Peer peer = removed.remove(0);
         peer.disconnect();
         removePeerFromPieces(peer);
     }
@@ -336,9 +342,9 @@ public class PeerCoordinator implements PeerListener
   // caller must synchronize on peers
   private static Peer peerIDInList(PeerID pid, List peers)
   {
-    Iterator it = peers.iterator();
+    Iterator<Peer> it = peers.iterator();
     while (it.hasNext()) {
-      Peer cur = (Peer)it.next();
+      Peer cur = it.next();
       if (pid.sameID(cur.getPeerID()))
         return cur;
     }
@@ -402,15 +408,15 @@ public class PeerCoordinator implements PeerListener
     // linked list will contain all interested peers that we choke.
     // At the start are the peers that have us unchoked at the end the
     // other peer that are interested, but are choking us.
-    List interested = new LinkedList();
+    List<Peer> interested = new LinkedList();
     synchronized (peers) {
         int count = 0;
         int unchokedCount = 0;
         int maxUploaders = allowedUploaders();
-        Iterator it = peers.iterator();
+        Iterator<Peer> it = peers.iterator();
         while (it.hasNext())
           {
-            Peer peer = (Peer)it.next();
+            Peer peer = it.next();
             if (peer.isChoking() && peer.isInterested())
               {
                 count++;
@@ -424,9 +430,9 @@ public class PeerCoordinator implements PeerListener
               }
           }
 
-        while (uploaders < maxUploaders && interested.size() > 0)
+        while (uploaders < maxUploaders && !interested.isEmpty())
           {
-            Peer peer = (Peer)interested.remove(0);
+            Peer peer = interested.remove(0);
             if (_log.shouldLog(Log.DEBUG))
               _log.debug("Unchoke: " + peer);
             peer.setChoking(false);
@@ -471,10 +477,10 @@ public class PeerCoordinator implements PeerListener
 
     synchronized(wantedPieces)
       {
-        Iterator it = wantedPieces.iterator();
+        Iterator<Piece> it = wantedPieces.iterator();
         while (it.hasNext())
           {
-            Piece p = (Piece)it.next();
+            Piece p = it.next();
             int i = p.getId();
             if (bitfield.get(i)) {
               p.addPeer(peer);
@@ -485,6 +491,13 @@ public class PeerCoordinator implements PeerListener
     return false;
   }
 
+  /**
+   *  This should be somewhat less than the max conns per torrent,
+   *  but not too much less, so a torrent doesn't get stuck near the end.
+   *  @since 0.7.14
+   */
+  private static final int END_GAME_THRESHOLD = 8;
+
   /**
    * Returns one of pieces in the given BitField that is still wanted or
    * -1 if none of the given pieces are wanted.
@@ -501,11 +514,11 @@ public class PeerCoordinator implements PeerListener
       {
         Piece piece = null;
         Collections.sort(wantedPieces); // Sort in order of rarest first.
-        List requested = new ArrayList(); 
-        Iterator it = wantedPieces.iterator();
+        List<Piece> requested = new ArrayList(); 
+        Iterator<Piece> it = wantedPieces.iterator();
         while (piece == null && it.hasNext())
           {
-            Piece p = (Piece)it.next();
+            Piece p = it.next();
             if (havePieces.get(p.getId()) && !p.isRequested())
               {
                 piece = p;
@@ -518,12 +531,17 @@ public class PeerCoordinator implements PeerListener
         
         //Only request a piece we've requested before if there's no other choice.
         if (piece == null) {
+            // AND if there are almost no wanted pieces left (real end game).
+            // If we do end game all the time, we generate lots of extra traffic
+            // when the seeder is super-slow and all the peers are "caught up"
+            if (wantedPieces.size() > END_GAME_THRESHOLD)
+                return -1;  // nothing to request and not in end game
             // let's not all get on the same piece
             Collections.shuffle(requested);
-            Iterator it2 = requested.iterator();
+            Iterator<Piece> it2 = requested.iterator();
             while (piece == null && it2.hasNext())
               {
-                Piece p = (Piece)it2.next();
+                Piece p = it2.next();
                 if (havePieces.get(p.getId()))
                   {
                     piece = p;
@@ -643,11 +661,11 @@ public class PeerCoordinator implements PeerListener
     // Disconnect from other seeders when we get the last piece
     synchronized(peers)
       {
-        List toDisconnect = new ArrayList(); 
-        Iterator it = peers.iterator();
+        List<Peer> toDisconnect = new ArrayList(); 
+        Iterator<Peer> it = peers.iterator();
         while (it.hasNext())
           {
-            Peer p = (Peer)it.next();
+            Peer p = it.next();
             if (p.isConnected())
               {
                   if (completed() && p.isCompleted())
@@ -659,7 +677,7 @@ public class PeerCoordinator implements PeerListener
         it = toDisconnect.iterator();
         while (it.hasNext())
           {
-            Peer p = (Peer)it.next();
+            Peer p = it.next();
             p.disconnect(true);
           }
       }
@@ -725,8 +743,8 @@ public class PeerCoordinator implements PeerListener
    */
   public void removePeerFromPieces(Peer peer) {
       synchronized(wantedPieces) {
-          for(Iterator iter = wantedPieces.iterator(); iter.hasNext(); ) {
-              Piece piece = (Piece)iter.next();
+          for(Iterator<Piece> iter = wantedPieces.iterator(); iter.hasNext(); ) {
+              Piece piece = iter.next();
               piece.removePeer(peer);
           }
       } 
@@ -780,8 +798,8 @@ public class PeerCoordinator implements PeerListener
     }
     synchronized(wantedPieces)
       {
-        for(Iterator iter = wantedPieces.iterator(); iter.hasNext(); ) {
-          Piece piece = (Piece)iter.next();
+        for(Iterator<Piece> iter = wantedPieces.iterator(); iter.hasNext(); ) {
+          Piece piece = iter.next();
           if (piece.getId() == savedRequest.piece) {
             Request req = savedRequest;
             piece.setRequested(true);
@@ -806,9 +824,9 @@ public class PeerCoordinator implements PeerListener
     // see if anybody else is requesting
     synchronized (peers)
       {
-        Iterator it = peers.iterator();
+        Iterator<Peer> it = peers.iterator();
         while (it.hasNext()) {
-          Peer p = (Peer)it.next();
+          Peer p = it.next();
           if (p.equals(peer))
             continue;
           if (p.state == null)
@@ -826,9 +844,9 @@ public class PeerCoordinator implements PeerListener
     // nobody is, so mark unrequested
     synchronized(wantedPieces)
       {
-        Iterator it = wantedPieces.iterator();
+        Iterator<Piece> it = wantedPieces.iterator();
         while (it.hasNext()) {
-          Piece p = (Piece)it.next();
+          Piece p = it.next();
           if (p.getId() == piece) {
             p.setRequested(false);
             if (_log.shouldLog(Log.DEBUG))

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

@@ -24,11 +24,12 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import net.i2p.I2PAppContext;
 import net.i2p.util.Log;
 
 class PeerState
 {
-  private Log _log = new Log(PeerState.class);
+  private final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(PeerState.class);
   final Peer peer;
   final PeerListener listener;
   final MetaInfo metainfo;
@@ -152,7 +153,16 @@ class PeerState
         // XXX - Check for weird bitfield and disconnect?
         bitfield = new BitField(bitmap, metainfo.getPieces());
       }
-    setInteresting(listener.gotBitField(peer, bitfield));
+    boolean interest = listener.gotBitField(peer, bitfield);
+    setInteresting(interest);
+    if (bitfield.complete() && !interest) {
+        // They are seeding and we are seeding,
+        // why did they contact us? (robert)
+        // Dump them quick before we send our whole bitmap
+        if (_log.shouldLog(Log.WARN))
+            _log.warn("Disconnecting seed that connects to seeds: " + peer);
+        peer.disconnect(true);
+    }
   }
 
   void requestMessage(int piece, int begin, int length)
@@ -186,6 +196,7 @@ class PeerState
 
     // Limit total pipelined requests to MAX_PIPELINE bytes
     // to conserve memory and prevent DOS
+    // Todo: limit number of requests also? (robert 64 x 4KB)
     if (out.queuedBytes() + length > MAX_PIPELINE_BYTES)
       {
         if (_log.shouldLog(Log.WARN))
@@ -512,8 +523,10 @@ class PeerState
       _log.debug(peer + " requests " + outstandingRequests);
   }
 
-  // Starts requesting first chunk of next piece. Returns true if
-  // something has been added to the requests, false otherwise.
+  /**
+   * Starts requesting first chunk of next piece. Returns true if
+   * something has been added to the requests, false otherwise.
+   */
   private boolean requestNextPiece()
   {
     // Check that we already know what the other side has.
@@ -545,6 +558,15 @@ class PeerState
             if (nextPiece != -1
                 && (lastRequest == null || lastRequest.piece != nextPiece))
               {
+                // Fail safe to make sure we are interested
+                // When we transition into the end game we may not be interested...
+                if (!interesting) {
+                    if (_log.shouldLog(Log.DEBUG))
+                        _log.debug(peer + " transition to end game, setting interesting");
+                    interesting = true;
+                    out.sendInterest(true);
+                }
+
                 int piece_length = metainfo.getPieceLength(nextPiece);
                 //Catch a common place for OOMs esp. on 1MB pieces
                 byte[] bs;

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

@@ -321,7 +321,7 @@ public class Snark
     // sixteen random bytes.
     byte snark = (((3 + 7 + 10) * (1000 - 8)) / 992) - 17;
     id = new byte[20];
-    Random random = new Random();
+    Random random = I2PAppContext.getGlobalContext().random();
     int i;
     for (i = 0; i < 9; i++)
       id[i] = 0;
@@ -618,14 +618,14 @@ public class Snark
             command_interpreter = false;
             i++;
           }
-        else if (args[i].equals("--eepproxy"))
-          {
-            String proxyHost = args[i+1];
-            String proxyPort = args[i+2];
-            if (!configured)
-                util.setProxy(proxyHost, Integer.parseInt(proxyPort));
-            i += 3;
-          }
+        //else if (args[i].equals("--eepproxy"))
+        //  {
+        //    String proxyHost = args[i+1];
+        //    String proxyPort = args[i+2];
+        //    if (!configured)
+        //        util.setProxy(proxyHost, Integer.parseInt(proxyPort));
+        //    i += 3;
+        //  }
         else if (args[i].equals("--i2cp"))
           {
             String i2cpHost = args[i+1];
@@ -734,7 +734,7 @@ public class Snark
     //if (debug >= INFO && t != null)
     //  t.printStackTrace();
     stopTorrent();
-    throw new RuntimeException("die bart die");
+    throw new RuntimeException(s + (t == null ? "" : ": " + t));
   }
 
   /**

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

@@ -29,8 +29,8 @@ public class SnarkManager implements Snark.CompleteListener {
     private static SnarkManager _instance = new SnarkManager();
     public static SnarkManager instance() { return _instance; }
     
-    /** map of (canonical) filename to Snark instance (unsynchronized) */
-    private final Map _snarks;
+    /** map of (canonical) filename of the .torrent file to Snark instance (unsynchronized) */
+    private final Map<String, Snark> _snarks;
     private final Object _addSnarkLock;
     private /* FIXME final FIXME */ File _configFile;
     private Properties _config;
@@ -40,12 +40,14 @@ public class SnarkManager implements Snark.CompleteListener {
     private I2PSnarkUtil _util;
     private PeerCoordinatorSet _peerCoordinatorSet;
     private ConnectionAcceptor _connectionAcceptor;
+    private Thread _monitor;
+    private boolean _running;
     
     public static final String PROP_I2CP_HOST = "i2psnark.i2cpHost";
     public static final String PROP_I2CP_PORT = "i2psnark.i2cpPort";
     public static final String PROP_I2CP_OPTS = "i2psnark.i2cpOptions";
-    public static final String PROP_EEP_HOST = "i2psnark.eepHost";
-    public static final String PROP_EEP_PORT = "i2psnark.eepPort";
+    //public static final String PROP_EEP_HOST = "i2psnark.eepHost";
+    //public static final String PROP_EEP_PORT = "i2psnark.eepPort";
     public static final String PROP_UPLOADERS_TOTAL = "i2psnark.uploaders.total";
     public static final String PROP_UPBW_MAX = "i2psnark.upbw.max";
     public static final String PROP_DIR = "i2psnark.dir";
@@ -57,10 +59,11 @@ public class SnarkManager implements Snark.CompleteListener {
     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_STARTUP_DELAY = "i2psnark.startupDelay";
+   
     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; 
     private SnarkManager() {
         _snarks = new HashMap();
         _addSnarkLock = new Object();
@@ -78,15 +81,22 @@ public class SnarkManager implements Snark.CompleteListener {
      *  for i2cp host/port or i2psnark.dir
      */
     public void start() {
+        _running = true;
         _peerCoordinatorSet = new PeerCoordinatorSet();
         _connectionAcceptor = new ConnectionAcceptor(_util);
         int minutes = getStartupDelayMinutes();
         _messages.add(_("Adding torrents in {0} minutes", minutes));
-        I2PAppThread monitor = new I2PAppThread(new DirMonitor(), "Snark DirMonitor");
-        monitor.setDaemon(true);
-        monitor.start();
+        _monitor = new I2PAppThread(new DirMonitor(), "Snark DirMonitor", true);
+        _monitor.start();
         _context.addShutdownTask(new SnarkManagerShutdown());
     }
+
+    public void stop() {
+        _running = false;
+        _monitor.interrupt();
+        _connectionAcceptor.halt();
+        (new SnarkManagerShutdown()).run();
+    }
     
     /** hook to I2PSnarkUtil for the servlet */
     public I2PSnarkUtil util() { return _util; }
@@ -115,7 +125,9 @@ public class SnarkManager implements Snark.CompleteListener {
     public String linkPrefix() {
         return _config.getProperty(PROP_LINK_PREFIX, DEFAULT_LINK_PREFIX + getDataDir().getAbsolutePath() + File.separatorChar);
     }
-    private int getStartupDelayMinutes() { return 3; }
+    private int getStartupDelayMinutes() { 
+	return Integer.valueOf(_config.getProperty(PROP_STARTUP_DELAY)).intValue(); 
+    }
     public File getDataDir() { 
         String dir = _config.getProperty(PROP_DIR, "i2psnark");
         File f = new File(dir);
@@ -148,16 +160,19 @@ public class SnarkManager implements Snark.CompleteListener {
             _config.setProperty(PROP_I2CP_PORT, "7654");
         if (!_config.containsKey(PROP_I2CP_OPTS))
             _config.setProperty(PROP_I2CP_OPTS, "inbound.length=2 inbound.lengthVariance=0 outbound.length=2 outbound.lengthVariance=0 inbound.quantity=3 outbound.quantity=3");
-        if (!_config.containsKey(PROP_EEP_HOST))
-            _config.setProperty(PROP_EEP_HOST, "127.0.0.1");
-        if (!_config.containsKey(PROP_EEP_PORT))
-            _config.setProperty(PROP_EEP_PORT, "4444");
+        //if (!_config.containsKey(PROP_EEP_HOST))
+        //    _config.setProperty(PROP_EEP_HOST, "127.0.0.1");
+        //if (!_config.containsKey(PROP_EEP_PORT))
+        //    _config.setProperty(PROP_EEP_PORT, "4444");
         if (!_config.containsKey(PROP_UPLOADERS_TOTAL))
             _config.setProperty(PROP_UPLOADERS_TOTAL, "" + Snark.MAX_TOTAL_UPLOADERS);
         if (!_config.containsKey(PROP_DIR))
             _config.setProperty(PROP_DIR, "i2psnark");
         if (!_config.containsKey(PROP_AUTO_START))
             _config.setProperty(PROP_AUTO_START, DEFAULT_AUTO_START);
+	if (!_config.containsKey(PROP_STARTUP_DELAY))
+            _config.setProperty(PROP_STARTUP_DELAY, "" + DEFAULT_STARTUP_DELAY);
+
         updateConfig();
     }
 
@@ -189,12 +204,13 @@ public class SnarkManager implements Snark.CompleteListener {
             _log.debug("Configuring with I2CP options " + i2cpOpts);
         }
         //I2PSnarkUtil.instance().setI2CPConfig("66.111.51.110", 7654, new Properties());
-        String eepHost = _config.getProperty(PROP_EEP_HOST);
-        int eepPort = getInt(PROP_EEP_PORT, 4444);
-        if (eepHost != null)
-            _util.setProxy(eepHost, eepPort);
+        //String eepHost = _config.getProperty(PROP_EEP_HOST);
+        //int eepPort = getInt(PROP_EEP_PORT, 4444);
+        //if (eepHost != null)
+        //    _util.setProxy(eepHost, eepPort);
         _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);
         if (ot != null)
             _util.setOpenTrackerString(ot);
@@ -213,24 +229,24 @@ public class SnarkManager implements Snark.CompleteListener {
         return defaultVal;
     }
     
-    public void updateConfig(String dataDir, boolean autoStart, String seedPct, String eepHost, 
+    public void updateConfig(String dataDir, boolean autoStart, String startDelay, String seedPct, String eepHost, 
                              String eepPort, String i2cpHost, String i2cpPort, String i2cpOpts,
                              String upLimit, String upBW, boolean useOpenTrackers, String openTrackers) {
         boolean changed = false;
-        if (eepHost != null) {
-            // unused, we use socket eepget
-            int port = _util.getEepProxyPort();
-            try { port = Integer.parseInt(eepPort); } catch (NumberFormatException nfe) {}
-            String host = _util.getEepProxyHost();
-            if ( (eepHost.trim().length() > 0) && (port > 0) &&
-                 ((!host.equals(eepHost) || (port != _util.getEepProxyPort()) )) ) {
-                _util.setProxy(eepHost, port);
-                changed = true;
-                _config.setProperty(PROP_EEP_HOST, eepHost);
-                _config.setProperty(PROP_EEP_PORT, eepPort+"");
-                addMessage("EepProxy location changed to " + eepHost + ":" + port);
-            }
-        }
+        //if (eepHost != null) {
+        //    // unused, we use socket eepget
+        //    int port = _util.getEepProxyPort();
+        //    try { port = Integer.parseInt(eepPort); } catch (NumberFormatException nfe) {}
+        //    String host = _util.getEepProxyHost();
+        //    if ( (eepHost.trim().length() > 0) && (port > 0) &&
+        //         ((!host.equals(eepHost) || (port != _util.getEepProxyPort()) )) ) {
+        //        _util.setProxy(eepHost, port);
+        //        changed = true;
+        //        _config.setProperty(PROP_EEP_HOST, eepHost);
+        //        _config.setProperty(PROP_EEP_PORT, eepPort+"");
+        //        addMessage("EepProxy location changed to " + eepHost + ":" + port);
+        //    }
+        //}
         if (upLimit != null) {
             int limit = _util.getMaxUploaders();
             try { limit = Integer.parseInt(upLimit); } catch (NumberFormatException nfe) {}
@@ -259,7 +275,19 @@ public class SnarkManager implements Snark.CompleteListener {
                 }
             }
         }
-        if (i2cpHost != null) {
+        
+	if (startDelay != null){
+		int minutes = _util.getStartupDelay();
+                try { minutes = Integer.parseInt(startDelay); } catch (NumberFormatException nfe) {}
+	        if ( minutes != _util.getStartupDelay()) {
+                	    _util.setStartupDelay(minutes);
+	                    changed = true;
+        	            _config.setProperty(PROP_STARTUP_DELAY, "" + minutes);
+                	    addMessage(_("Startup delay limit changed to {0} minutes", minutes));
+                	}
+
+	}
+	if (i2cpHost != null) {
             int oldI2CPPort = _util.getI2CPPort();
             String oldI2CPHost = _util.getI2CPHost();
             int port = oldI2CPPort;
@@ -299,7 +327,10 @@ public class SnarkManager implements Snark.CompleteListener {
                     }
                 }
                 if (snarksActive) {
-                    addMessage(_("Cannot change the I2CP settings while torrents are active"));
+                    Properties p = new Properties();
+                    p.putAll(opts);
+                    _util.setI2CPConfig(i2cpHost, port, p);
+                    addMessage(_("I2CP and tunnel changes will take effect after stopping all torrents"));
                     _log.debug("i2cp host [" + i2cpHost + "] i2cp port " + port + " opts [" + opts 
                                + "] oldOpts [" + oldOpts + "]");
                 } else {
@@ -384,12 +415,30 @@ public class SnarkManager implements Snark.CompleteListener {
     /** hardcoded for sanity.  perhaps this should be customizable, for people who increase their ulimit, etc. */
     private static final int MAX_FILES_PER_TORRENT = 512;
     
-    /** set of filenames that we are dealing with */
-    public Set listTorrentFiles() { synchronized (_snarks) { return new HashSet(_snarks.keySet()); } }
+    /** set of canonical .torrent filenames that we are dealing with */
+    public Set<String> listTorrentFiles() { synchronized (_snarks) { return new HashSet(_snarks.keySet()); } }
+
     /**
-     * Grab the torrent given the (canonical) filename
+     * 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); } }
+
+    /**
+     * Grab the torrent given the base name of the storage
+     * @return Snark or null
+     * @since 0.7.14
+     */
+    public Snark getTorrentByBaseName(String filename) {
+        synchronized (_snarks) {
+            for (Snark s : _snarks.values()) {
+                if (s.storage.getBaseName().equals(filename))
+                    return s;
+            }
+        }
+        return null;
+    }
+
     public void addTorrent(String filename) { addTorrent(filename, false); }
     public void addTorrent(String filename, boolean dontAutoStart) {
         if ((!dontAutoStart) && !_util.connected()) {
@@ -583,8 +632,8 @@ public class SnarkManager implements Snark.CompleteListener {
         } else if (info.getPieces() > Storage.MAX_PIECES) {
             return _("Too many pieces in \"{0}\", limit is {1}, deleting it!", info.getName(), Storage.MAX_PIECES);
         } else if (info.getPieceLength(0) > Storage.MAX_PIECE_SIZE) {
-            return _("Pieces are too large in \"{0}\" ({1}B), deleting it.", info.getName(), DataHelper.formatSize(info.getPieceLength(0))) + ' ' +
-                   _("Limit is {0}B", DataHelper.formatSize(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() > Storage.MAX_TOTAL_SIZE) {
             System.out.println("torrent info: " + info.toString());
             List lengths = info.getLengths();
@@ -677,7 +726,7 @@ public class SnarkManager implements Snark.CompleteListener {
     public void torrentComplete(Snark snark) {
         File f = new File(snark.torrent);
         long len = snark.meta.getTotalLength();
-        addMessage(_("Download finished: \"{0}\"", f.getName()) + " (" + _("size: {0}B", DataHelper.formatSize(len)) + ')');
+        addMessage(_("Download finished: \"{0}\"", f.getName()) + " (" + _("size: {0}B", DataHelper.formatSize2(len)) + ')');
         updateStatus(snark);
     }
     

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

@@ -286,6 +286,50 @@ public class Storage
     return needed == 0;
   }
 
+  /**
+   *  @param file canonical path (non-directory)
+   *  @return number of bytes remaining; -1 if unknown file
+   *  @since 0.7.14
+   */
+  public long remaining(String file) {
+      long bytes = 0;
+      for (int i = 0; i < rafs.length; i++) {
+          File f = RAFfile[i];
+          // use canonical in case snark dir or sub dirs are symlinked
+          String canonical = null;
+          if (f != null) {
+              try {
+                  canonical = f.getCanonicalPath();
+              } catch (IOException ioe) {
+                  f = null;
+              }
+          }
+          if (f != null && canonical.equals(file)) {
+              if (complete())
+                  return 0;
+              int psz = metainfo.getPieceLength(0);
+              long start = bytes;
+              long end = start + lengths[i];
+              int pc = (int) (bytes / psz);
+              long rv = 0;
+              if (!bitfield.get(pc))
+                  rv = Math.min(psz - (start % psz), lengths[i]);
+              int pieces = metainfo.getPieces();
+              for (int j = pc + 1; (((long)j) * psz) < end && j < pieces; j++) {
+                  if (!bitfield.get(j)) {
+                      if (((long)(j+1))*psz < end)
+                          rv += psz;
+                      else
+                          rv += end - (((long)j) * psz);
+                  }
+              }
+              return rv;
+          }
+          bytes += lengths[i];
+      }
+      return -1;
+  }
+
   /**
    * The BitField that tells which pieces this storage contains.
    * Do not change this since this is the current state of the storage.
@@ -295,6 +339,18 @@ public class Storage
     return bitfield;
   }
 
+  /**
+   *  The base file or directory name of the data,
+   *  as specified in the .torrent file, but filtered to remove
+   *  illegal characters. This is where the data actually is,
+   *  relative to the snark base dir.
+   *
+   *  @since 0.7.14
+   */
+  public String getBaseName() {
+      return filterName(metainfo.getName());
+  }
+
   /**
    * Creates (and/or checks) all files from the metainfo file list.
    */

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

@@ -33,6 +33,7 @@ import java.util.List;
 import java.util.Random;
 import java.util.Set;
 
+import net.i2p.I2PAppContext;
 import net.i2p.util.I2PAppThread;
 import net.i2p.util.Log;
 
@@ -44,7 +45,7 @@ import net.i2p.util.Log;
  */
 public class TrackerClient extends I2PAppThread
 {
-  private static final Log _log = new Log(TrackerClient.class);
+  private final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(TrackerClient.class);
   private static final String NO_EVENT = "";
   private static final String STARTED_EVENT = "started";
   private static final String COMPLETED_EVENT = "completed";
@@ -150,7 +151,7 @@ public class TrackerClient extends I2PAppThread
                 continue;
              String dest = _util.lookup(url.substring(7, slash));
              if (dest == null) {
-                _log.error("Announce host unknown: [" + url + "]");
+                _log.error("Announce host unknown: [" + url.substring(7, slash) + "]");
                 continue;
              }
              if (primary.startsWith("http://" + dest))
@@ -162,7 +163,7 @@ public class TrackerClient extends I2PAppThread
         }
     }
 
-    if (tlist.size() <= 0) {
+    if (tlist.isEmpty()) {
         // FIXME really need to get this message to the gui
         stop = true;
         _log.error("No valid trackers for infoHash: " + infoHash);
@@ -182,7 +183,7 @@ public class TrackerClient extends I2PAppThread
         boolean runStarted = false;
         boolean firstTime = true;
         int consecutiveFails = 0;
-        Random r = new Random();
+        Random r = I2PAppContext.getGlobalContext().random();
         while(!stop)
           {
             try
@@ -258,7 +259,7 @@ public class TrackerClient extends I2PAppThread
                     tr.started = true;
 
                     Set peers = info.getPeers();
-                    tr.seenPeers = peers.size();
+                    tr.seenPeers = info.getPeerCount();
                     if (coordinator.trackerSeenPeers < tr.seenPeers) // update rising number quickly
                         coordinator.trackerSeenPeers = tr.seenPeers;
                     if ( (left > 0) && (!completed) ) {
@@ -269,6 +270,7 @@ public class TrackerClient extends I2PAppThread
                         Iterator it = ordered.iterator();
                         while (it.hasNext()) {
                           Peer cur = (Peer)it.next();
+                          // FIXME if id == us || dest == us continue;
                           // only delay if we actually make an attempt to add peer
                           if(coordinator.addPeer(cur)) {
                             int delay = DELAY_MUL;
@@ -356,6 +358,10 @@ public class TrackerClient extends I2PAppThread
       + "&downloaded=" + downloaded
       + "&left=" + left
       + ((! event.equals(NO_EVENT)) ? ("&event=" + event) : "");
+    if (left <= 0 || event.equals(STOPPED_EVENT) || !coordinator.needPeers())
+        s += "&numwant=0";
+    else
+        s += "&numwant=" + _util.getMaxConnections();
     _util.debug("Sending TrackerClient request: " + s, Snark.INFO);
       
     tr.lastRequestTime = System.currentTimeMillis();
@@ -430,7 +436,7 @@ public class TrackerClient extends I2PAppThread
            url.getPort() < 0;
   }
 
-  private class Tracker
+  private static class Tracker
   {
       String announce;
       boolean isPrimary;

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

@@ -23,6 +23,7 @@ package org.klomp.snark;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashSet;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -37,6 +38,8 @@ public class TrackerInfo
   private final String failure_reason;
   private final int interval;
   private final Set peers;
+  private int complete;
+  private int incomplete;
 
   public TrackerInfo(InputStream in, byte[] my_id, MetaInfo metainfo)
     throws IOException
@@ -68,11 +71,26 @@ public class TrackerInfo
           throw new InvalidBEncodingException("No interval given");
         else
           interval = beInterval.getInt();
+
         BEValue bePeers = (BEValue)m.get("peers");
         if (bePeers == null)
-          throw new InvalidBEncodingException("No peer list");
+          peers = Collections.EMPTY_SET;
         else
           peers = getPeers(bePeers.getList(), my_id, metainfo);
+
+        BEValue bev = (BEValue)m.get("complete");
+        if (bev != null) try {
+          complete = bev.getInt();
+          if (complete < 0)
+              complete = 0;
+        } catch (InvalidBEncodingException ibe) {}
+
+        bev = (BEValue)m.get("incomplete");
+        if (bev != null) try {
+          incomplete = bev.getInt();
+          if (incomplete < 0)
+              incomplete = 0;
+        } catch (InvalidBEncodingException ibe) {}
       }
   }
 
@@ -115,6 +133,12 @@ public class TrackerInfo
     return peers;
   }
 
+  public int getPeerCount()
+  {
+    int pc = peers == null ? 0 : peers.size();
+    return Math.max(pc, complete + incomplete - 1);
+  }
+
   public String getFailureReason()
   {
     return failure_reason;
@@ -132,6 +156,8 @@ public class TrackerInfo
       return "TrackerInfo[FAILED: " + failure_reason + "]";
     else
       return "TrackerInfo[interval=" + interval
+        + (complete > 0 ? (", complete=" + complete) : "" )
+        + (incomplete > 0 ? (", incomplete=" + incomplete) : "" )
         + ", peers=" + peers + "]";
   }
 }

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

@@ -7,6 +7,9 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.text.Collator;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -15,6 +18,7 @@ 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;
@@ -34,20 +38,27 @@ 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;
+
 /**
- *
+ *  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 HttpServlet {
+public class I2PSnarkServlet extends Default {
     private I2PAppContext _context;
     private Log _log;
     private SnarkManager _manager;
     private static long _nonce;
+    private Resource _resourceBase;
     
     public static final String PROP_CONFIG_FILE = "i2psnark.configFile";
     
     @Override
     public void init(ServletConfig cfg) throws ServletException {
-        super.init(cfg);
         _context = I2PAppContext.getGlobalContext();
         _log = _context.logManager().getLog(I2PSnarkServlet.class);
         _nonce = _context.random().nextLong();
@@ -57,15 +68,92 @@ public class I2PSnarkServlet extends HttpServlet {
             configFile = "i2psnark.config";
         _manager.loadConfig(configFile);
         _manager.start();
+        try {
+            _resourceBase = Resource.newResource(_manager.getDataDir().getAbsolutePath());
+        } catch (IOException ioe) {}
+        super.init(cfg);
     }
     
+    @Override
+    public void destroy() {
+        _manager.stop();
+        super.destroy();
+    }
+
+    /**
+     *  We override this instead of passing a resource base to super(), because
+     *  if a resource base is set, super.getResource() always uses that base,
+     *  and we can't get any resources (like icons) out of the .war
+     */
+    @Override
+    protected Resource getResource(String pathInContext) throws IOException
+    {
+        if (pathInContext == null || pathInContext.equals("/") || pathInContext.equals("/index.jsp") ||
+            pathInContext.equals("/index.html") || pathInContext.startsWith("/_icons/"))
+            return super.getResource(pathInContext);
+        // files in the i2psnark/ directory
+        return _resourceBase.addPath(pathInContext);
+    }
+
+    /**
+     * Some parts modified from:
+     * <pre>
+      // ========================================================================
+      // $Id: Default.java,v 1.51 2006/10/08 14:13:18 gregwilkins Exp $
+      // Copyright 199-2004 Mort Bay Consulting Pty. Ltd.
+      // ------------------------------------------------------------------------
+      // Licensed under the Apache License, Version 2.0 (the "License");
+      // you may not use this file except in compliance with the License.
+      // You may obtain a copy of the License at 
+      // http://www.apache.org/licenses/LICENSE-2.0
+      // Unless required by applicable law or agreed to in writing, software
+      // distributed under the License is distributed on an "AS IS" BASIS,
+      // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      // See the License for the specific language governing permissions and
+      // limitations under the License.
+      // ========================================================================
+     * </pre>
+     *
+     */
     @Override
     public void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        // 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);
+            return;
+        }
+        // this is the part after /i2psnark
+        String path = req.getServletPath();
+        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") || isConfigure)) {
+            if (path.endsWith("/")) {
+                // bypass the horrid Resource.getListHTML()
+                String pathInfo = req.getPathInfo();
+                String pathInContext = URI.addPaths(path, pathInfo);
+                resp.setCharacterEncoding("UTF-8");
+                resp.setContentType("text/html; charset=UTF-8");
+                Resource resource = getResource(pathInContext);
+                if (resource == null || (!resource.exists()) || !resource.isDirectory()) {
+                    resp.sendError(HttpResponse.__404_Not_Found);
+                } else {
+                    String base = URI.addPaths(req.getRequestURI(), "/");
+                    String listing = getListHTML(resource, base, true);
+                    if (listing != null)
+                        resp.getWriter().write(listing);
+                    else // shouldn't happen
+                        resp.sendError(HttpResponse.__404_Not_Found);
+                }
+            } else {
+                super.service(req, resp);
+            }
+            return;
+        }
+
         req.setCharacterEncoding("UTF-8");
         resp.setCharacterEncoding("UTF-8");
         resp.setContentType("text/html; charset=UTF-8");
-        /** dl, ul, down rate, up rate, peers, size */
-        final long stats[] = {0,0,0,0,0,0};
         
         String nonce = req.getParameter("nonce");
         if ( (nonce != null) && (nonce.equals(String.valueOf(_nonce))) )
@@ -87,28 +175,37 @@ public class I2PSnarkServlet extends HttpServlet {
         out.write("</title>\n");
                                          
         // we want it to go to the base URI so we don't refresh with some funky action= value
-        out.write("<meta http-equiv=\"refresh\" content=\"60;" + req.getRequestURI() + peerString + "\">\n");
+        if (!isConfigure)
+            out.write("<meta http-equiv=\"refresh\" content=\"60;" + req.getRequestURI() + peerString + "\">\n");
         out.write(HEADER);
         out.write("</head><body>");
         out.write("<center>");
-        out.write("<div class=\"snarknavbar\"><a href=\"" + req.getRequestURI() + peerString + "\" title=\"");
-        out.write(_("Refresh page"));
-        out.write("\" class=\"snarkRefresh\">");
-        out.write(_("I2PSnark"));
-        out.write("</a> <a href=\"http://forum.i2p/viewforum.php?f=21\" class=\"snarkRefresh\" target=\"_blank\">");
-        out.write(_("Forum"));
-        out.write("</a>\n");
+        if (isConfigure) {
+            out.write("<div class=\"snarknavbar\"><a href=\"/i2psnark/\" title=\"");
+            out.write(_("Torrents"));
+            out.write("\" class=\"snarkRefresh\">");
+            out.write(_("I2PSnark"));
+            out.write("</a>");
+        } else {
+            out.write("<div class=\"snarknavbar\"><a href=\"" + req.getRequestURI() + peerString + "\" title=\"");
+            out.write(_("Refresh page"));
+            out.write("\" class=\"snarkRefresh\">");
+            out.write(_("I2PSnark"));
+            out.write("</a> <a href=\"http://forum.i2p/viewforum.php?f=21\" class=\"snarkRefresh\" target=\"_blank\">");
+            out.write(_("Forum"));
+            out.write("</a>\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 baseURL = (String)entry.getValue();
-            int e = baseURL.indexOf('=');
-            if (e < 0)
-                continue;
-            baseURL = baseURL.substring(e + 1);
-            out.write(" <a href=\"" + baseURL + "\" class=\"snarkRefresh\" target=\"_blank\">" + name + "</a>");
+            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 baseURL = (String)entry.getValue();
+                int e = baseURL.indexOf('=');
+                if (e < 0)
+                    continue;
+                baseURL = baseURL.substring(e + 1);
+                out.write(" <a href=\"" + baseURL + "\" class=\"snarkRefresh\" target=\"_blank\">" + name + "</a>");
+            }
         }
         out.write("</div>\n");
         out.write("<div class=\"page\"><div class=\"mainsection\"><div class=\"snarkMessages\"><table><tr><td align=\"left\"><pre>");
@@ -119,11 +216,29 @@ public class I2PSnarkServlet extends HttpServlet {
         }
         out.write("</pre></td></tr></table></div>");
 
+        if (isConfigure) {
+            out.write("</div>\n");
+            writeConfigForm(out, req);
+        } else {
+            writeTorrents(out, req);
+            out.write("</div>\n");
+            writeAddForm(out, req);
+            writeSeedForm(out, req);
+            writeConfigLink(out);
+        }
+        out.write(FOOTER);
+    }
+
+    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();
         out.write(TABLE_HEADER);
         out.write(_("Status"));
-        if (_manager.util().connected() && snarks.size() > 0) {
+        if (_manager.util().connected() && !snarks.isEmpty()) {
             out.write(" (<a href=\"");
             out.write(req.getRequestURI());
             if (peerParam != null) {
@@ -157,7 +272,7 @@ public class I2PSnarkServlet extends HttpServlet {
             out.write("\">");
             out.write(_("Stop All"));
             out.write("</a>");
-        } else if (snarks.size() > 0) {
+        } else if (!snarks.isEmpty()) {
             out.write("<a href=\"" + uri + "?action=StartAll&nonce=" + _nonce +
                       "\" title=\"");
             out.write(_("Start all torrents and the I2P tunnel"));
@@ -175,7 +290,7 @@ public class I2PSnarkServlet extends HttpServlet {
             displaySnark(out, snark, uri, i, stats, showPeers, showDebug);
         }
 
-        if (snarks.size() <= 0) {
+        if (snarks.isEmpty()) {
             out.write("<tr class=\"snarkTorrentEven\">" +
                       "<td class=\"snarkTorrentEven\" align=\"center\"" +
                       " colspan=\"8\"><i>");
@@ -186,10 +301,10 @@ public class I2PSnarkServlet extends HttpServlet {
                       "    <th align=\"left\" colspan=\"2\">");
             out.write(_("Totals"));
             out.write(" (");
-            out.write(_("{0} torrents", snarks.size()));
+            out.write(ngettext("1 torrent", "{0} torrents", snarks.size()));
             out.write(", ");
-            out.write(DataHelper.formatSize(stats[5]) + "B, ");
-            out.write(_("{0} connected peers", stats[4]));
+            out.write(DataHelper.formatSize2(stats[5]) + "B, ");
+            out.write(ngettext("1 connected peer", "{0} connected peers", (int) stats[4]));
             out.write(")</th>\n" +
                       "    <th>&nbsp;</th>\n" +
                       "    <th align=\"right\">" + formatSize(stats[0]) + "</th>\n" +
@@ -200,13 +315,7 @@ public class I2PSnarkServlet extends HttpServlet {
                       "</tfoot>\n");
         }
         
-        out.write(TABLE_FOOTER);
-
-        writeAddForm(out, req);
-        if (true) // seeding needs to register the torrent first, so we can't start it automatically (boo, hiss)
-            writeSeedForm(out, req);
-        writeConfigForm(out, req);
-        out.write(FOOTER);
+        out.write("</table>");
     }
     
     /**
@@ -251,7 +360,7 @@ public class I2PSnarkServlet extends HttpServlet {
                 }
             } else if (newURL != null) {
                 if (newURL.startsWith("http://")) {
-                    _manager.addMessage(_("Fetching {0}", newURL));
+                    _manager.addMessage(_("Fetching {0}", urlify(newURL)));
                     I2PAppThread fetch = new I2PAppThread(new FetchAndAdd(_manager, newURL), "Fetch and add");
                     fetch.start();
                 } else {
@@ -365,12 +474,13 @@ public class I2PSnarkServlet extends HttpServlet {
             String eepPort = req.getParameter("eepPort");
             String i2cpHost = req.getParameter("i2cpHost");
             String i2cpPort = req.getParameter("i2cpPort");
-            String i2cpOpts = req.getParameter("i2cpOpts");
+            String i2cpOpts = buildI2CPOpts(req);
             String upLimit = req.getParameter("upLimit");
             String upBW = req.getParameter("upBW");
+	    String startupDel = req.getParameter("startupDelay");
             boolean useOpenTrackers = req.getParameter("useOpenTrackers") != null;
             String openTrackers = req.getParameter("openTrackers");
-            _manager.updateConfig(dataDir, autoStart, seedPct, eepHost, eepPort, i2cpHost, i2cpPort, i2cpOpts, upLimit, upBW, useOpenTrackers, openTrackers);
+            _manager.updateConfig(dataDir, autoStart, startupDel, seedPct, eepHost, eepPort, i2cpHost, i2cpPort, i2cpOpts, upLimit, upBW, useOpenTrackers, openTrackers);
         } else if ("Create".equals(action)) {
             String baseData = req.getParameter("baseFile");
             if (baseData != null && baseData.trim().length() > 0) {
@@ -432,11 +542,53 @@ public class I2PSnarkServlet extends HttpServlet {
         }
     }
     
-    private List getSortedSnarks(HttpServletRequest req) {
-        Set files = _manager.listTorrentFiles();
-        TreeSet fileNames = new TreeSet(Collator.getInstance()); // sorts it alphabetically
+    private static final String iopts[] = {"inbound.length", "inbound.quantity",
+                                           "outbound.length", "outbound.quantity" };
+
+    /** put the individual i2cp selections into the option string */
+    private static String buildI2CPOpts(HttpServletRequest req) {
+        StringBuilder buf = new StringBuilder(128);
+        String p = req.getParameter("i2cpOpts");
+        if (p != null)
+            buf.append(p);
+        for (int i = 0; i < iopts.length; i++) {
+            p = req.getParameter(iopts[i]);
+            if (p != null)
+                buf.append(' ').append(iopts[i]).append('=').append(p);
+        }
+        return buf.toString();
+    }
+
+    /**
+     *  Sort alphabetically in current locale, ignore case, ignore leading "the "
+     *  (I guess this is worth it, a lot of torrents start with "The "
+     *  These are full path names which makes it harder
+     *  @since 0.7.14
+     */
+    private class TorrentNameComparator implements Comparator<String> {
+        private final Comparator collator = Collator.getInstance();
+        private final String skip = _manager.getDataDir().getAbsolutePath() + File.separator;
+
+        public int compare(String l, String r) {
+            if (l.startsWith(skip))
+                l = l.substring(skip.length());
+            if (r.startsWith(skip))
+                r = r.substring(skip.length());
+            String llc = l.toLowerCase();
+            if (llc.startsWith("the ") || llc.startsWith("the."))
+                l = l.substring(4);
+            String rlc = r.toLowerCase();
+            if (rlc.startsWith("the ") || rlc.startsWith("the."))
+                r = r.substring(4);
+            return collator.compare(l, r);
+        }
+    }
+
+    private List<Snark> getSortedSnarks(HttpServletRequest req) {
+        Set<String> files = _manager.listTorrentFiles();
+        TreeSet<String> fileNames = new TreeSet(new TorrentNameComparator());
         fileNames.addAll(files);
-        ArrayList rv = new ArrayList(fileNames.size());
+        ArrayList<Snark> rv = new ArrayList(fileNames.size());
         for (Iterator iter = fileNames.iterator(); iter.hasNext(); ) {
             String name = (String)iter.next();
             Snark snark = _manager.getTorrent(name);
@@ -499,17 +651,19 @@ public class I2PSnarkServlet extends HttpServlet {
             err = snark.coordinator.trackerProblems;
             curPeers = snark.coordinator.getPeerCount();
             stats[4] += curPeers;
-            knownPeers = snark.coordinator.trackerSeenPeers;
+            knownPeers = Math.max(curPeers, snark.coordinator.trackerSeenPeers);
         }
         
         String statusString = _("Unknown");
         if (err != null) {
             if (isRunning && curPeers > 0 && !showPeers)
                 statusString = "<a title=\"" + err + "\">" + _("TrackerErr") + "</a> (" +
-                               curPeers + "/" + knownPeers +
-                               " <a href=\"" + uri + "?p=" + Base64.encode(snark.meta.getInfoHash()) + "\">" + _("peers") + "</a>)";
+                               "<a href=\"" + uri + "?p=" + Base64.encode(snark.meta.getInfoHash()) + "\">" +
+                               curPeers + '/' +
+                               ngettext("1 peer", "{0} peers", knownPeers) + "</a>)";
             else if (isRunning)
-                statusString = "<a title=\"" + err + "\">" + _("TrackerErr") + " (" + curPeers + '/' + knownPeers + ' ' + _("peers") + ')';
+                statusString = "<a title=\"" + err + "\">" + _("TrackerErr") + " (" + curPeers + '/' +
+                               ngettext("1 peer", "{0} peers", knownPeers) + ')';
             else {
                 if (err.length() > MAX_DISPLAYED_ERROR_LENGTH)
                     err = err.substring(0, MAX_DISPLAYED_ERROR_LENGTH) + "&hellip;";
@@ -518,25 +672,31 @@ public class I2PSnarkServlet extends HttpServlet {
         } else if (remaining <= 0) {
             if (isRunning && curPeers > 0 && !showPeers)
                 statusString = _("Seeding") + " (" +
-                               curPeers + '/' + knownPeers +
-                               " <a href=\"" + uri + "?p=" + Base64.encode(snark.meta.getInfoHash()) + "\">" + _("peers") + "</a>)";
+                               "<a href=\"" + uri + "?p=" + Base64.encode(snark.meta.getInfoHash()) + "\">" +
+                               curPeers + '/' +
+                               ngettext("1 peer", "{0} peers", knownPeers) + "</a>)";
             else if (isRunning)
-                statusString = _("Seeding") + " (" + curPeers + "/" + knownPeers + ' ' + _("peers") + ')';
+                statusString = _("Seeding") + " (" + curPeers + "/" +
+                               ngettext("1 peer", "{0} peers", knownPeers) + ')';
             else
                 statusString = _("Complete");
         } else {
             if (isRunning && curPeers > 0 && downBps > 0 && !showPeers)
                 statusString = _("OK") + " (" +
-                               curPeers + "/" + knownPeers +
-                               " <a href=\"" + uri + "?p=" + Base64.encode(snark.meta.getInfoHash()) + "\">" + _("peers") + "</a>)";
+                               "<a href=\"" + uri + "?p=" + Base64.encode(snark.meta.getInfoHash()) + "\">" +
+                               curPeers + "/" +
+                               ngettext("1 peer", "{0} peers", knownPeers) + "</a>)";
             else if (isRunning && curPeers > 0 && downBps > 0)
-                statusString = _("OK") + " (" + curPeers + "/" + knownPeers + ' ' + _("peers") + ')';
+                statusString = _("OK") + " (" + curPeers + "/" +
+                               ngettext("1 peer", "{0} peers", knownPeers) + ')';
             else if (isRunning && curPeers > 0 && !showPeers)
                 statusString = _("Stalled") + " (" +
-                               curPeers + '/' + knownPeers +
-                               " <a href=\"" + uri + "?p=" + Base64.encode(snark.meta.getInfoHash()) + "\">" + _("peers") + "</a>)";
+                               "<a href=\"" + uri + "?p=" + Base64.encode(snark.meta.getInfoHash()) + "\">" +
+                               curPeers + '/' +
+                               ngettext("1 peer", "{0} peers", knownPeers) + "</a>)";
             else if (isRunning && curPeers > 0)
-                statusString = _("Stalled") + " (" + curPeers + '/' + knownPeers + ' ' + _("peers") + ')';
+                statusString = _("Stalled") + " (" + curPeers + '/' +
+                               ngettext("1 peer", "{0} peers", knownPeers) + ')';
             else if (isRunning)
                 statusString = _("No Peers") + " (0/" + knownPeers + ')';
             else
@@ -549,17 +709,25 @@ public class I2PSnarkServlet extends HttpServlet {
         out.write(statusString + "</td>\n\t");
         out.write("<td align=\"left\" class=\"snarkTorrentName " + rowClass + "\">");
         
-        if (remaining == 0) {
-            out.write("<a href=\"" + _manager.linkPrefix() + snark.meta.getName() 
-                      + "\" title=\"");
+        if (remaining == 0 || snark.meta.getFiles() != null) {
+            out.write("<a href=\"" + snark.storage.getBaseName());
+            if (snark.meta.getFiles() != null)
+                out.write("/");
+            out.write("\" title=\"");
             if (snark.meta.getFiles() != null)
                 out.write(_("View files"));
             else
                 out.write(_("Open file"));
             out.write("\">");
         }
+        String icon;
+        if (snark.meta.getFiles() != null)
+            icon = "folder";
+        else
+            icon = toIcon(snark.meta.getName());
+        out.write(toImg(icon));
         out.write(filename);
-        if (remaining == 0)
+        if (remaining == 0 || snark.meta.getFiles() != null)
             out.write("</a>");
         // temporarily hardcoded for postman* and anonymity, requires bytemonsoon patch for lookup by info_hash
         String announce = snark.meta.getAnnounce();
@@ -593,7 +761,7 @@ public class I2PSnarkServlet extends HttpServlet {
         out.write("</td>\n\t");
         out.write("<td align=\"right\" class=\"snarkTorrentDownloaded " + rowClass + "\">");
         if (remaining > 0)
-            out.write(formatSize(total-remaining) + "/" + formatSize(total)); // 18MB/3GB
+            out.write(formatSize(total-remaining) + " / " + formatSize(total)); // 18MB/3GB
         else
             out.write(formatSize(total)); // 3GB
         out.write("</td>\n\t");
@@ -681,7 +849,7 @@ public class I2PSnarkServlet extends HttpServlet {
                     client = "Transmission";
                 else
                     client = _("Unknown") + " (" + ch + ')';
-                out.write(client + "&nbsp;&nbsp;" + peer.toString().substring(5, 9));
+                out.write(client + "&nbsp;&nbsp;<tt>" + peer.toString().substring(5, 9)+ "</tt>");
                 if (showDebug)
                     out.write(" inactive " + (peer.getInactiveTime() / 1000) + "s");
                 out.write("</td>\n\t");
@@ -743,9 +911,12 @@ public class I2PSnarkServlet extends HttpServlet {
     private void writeAddForm(PrintWriter out, HttpServletRequest req) throws IOException {
         String uri = req.getRequestURI();
         String newURL = req.getParameter("newURL");
-        if ( (newURL == null) || (newURL.trim().length() <= 0) ) newURL = "";
-        String newFile = req.getParameter("newFile");
-        if ( (newFile == null) || (newFile.trim().length() <= 0) ) newFile = "";
+        if ( (newURL == null) || (newURL.trim().length() <= 0) )
+            newURL = "";
+        else
+            newURL = DataHelper.stripHTML(newURL);    // XSS
+        //String newFile = req.getParameter("newFile");
+        //if ( (newFile == null) || (newFile.trim().length() <= 0) ) newFile = "";
         
         out.write("<span class=\"snarkNewTorrent\">\n");
         // *not* enctype="multipart/form-data", so that the input type=file sends the filename, not the file
@@ -773,8 +944,10 @@ public class I2PSnarkServlet extends HttpServlet {
     private void writeSeedForm(PrintWriter out, HttpServletRequest req) throws IOException {
         String uri = req.getRequestURI();
         String baseFile = req.getParameter("baseFile");
-        if (baseFile == null)
+        if (baseFile == null || baseFile.trim().length() <= 0)
             baseFile = "";
+        else
+            baseFile = DataHelper.stripHTML(baseFile);    // XSS
         
         out.write("<div class=\"newtorrentsection\"><span class=\"snarkNewTorrent\">\n");
         // *not* enctype="multipart/form-data", so that the input type=file sends the filename, not the file
@@ -849,6 +1022,13 @@ public class I2PSnarkServlet extends HttpServlet {
         out.write(_("If checked, automatically start torrents that are added"));
         out.write("\" >");
 
+	out.write("<tr><td>");
+        out.write(_("Startup delay"));
+        out.write(": <td><input name=\"startupDelay\" size=\"3\" class=\"r\" value=\"" + _manager.util().getStartupDelay() + "\"> ");
+        out.write(_("minutes"));
+        out.write("<br>\n"); 
+
+
         //Auto add: <input type="checkbox" name="autoAdd" value="true" title="If true, automatically add torrents that are found in the data directory" />
         //Auto stop: <input type="checkbox" name="autoStop" value="true" title="If true, automatically stop torrents that are removed from the data directory" />
         //out.write("<br>\n");
@@ -870,14 +1050,14 @@ public class I2PSnarkServlet extends HttpServlet {
 */
         out.write("<tr><td>");
         out.write(_("Total uploader limit"));
-        out.write(": <td><input type=\"text\" name=\"upLimit\" value=\""
+        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("<tr><td>");
         out.write(_("Up bandwidth limit"));
-        out.write(": <td><input type=\"text\" name=\"upBW\" value=\""
+        out.write(": <td><input type=\"text\" name=\"upBW\" class=\"r\" value=\""
                   + _manager.util().getMaxUpBW() + "\" size=\"3\" maxlength=\"3\" > KBps <i>(");
         out.write(_("Half available bandwidth recommended."));
         out.write(" <a href=\"/config.jsp\" target=\"blank\">");
@@ -903,6 +1083,20 @@ public class I2PSnarkServlet extends HttpServlet {
         //out.write("port: <input type=\"text\" name=\"eepPort\" value=\""
         //          + _manager.util().getEepProxyPort() + "\" size=\"5\" maxlength=\"5\" /><br>\n");
 
+        Map<String, String> options = new TreeMap(_manager.util().getI2CPOptions());
+        out.write("<tr><td>");
+        out.write(_("Inbound Settings"));
+        out.write(":<td>");
+        out.write(renderOptions(1, 6, options.remove("inbound.quantity"), "inbound.quantity", TUNNEL));
+        out.write("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
+        out.write(renderOptions(0, 4, options.remove("inbound.length"), "inbound.length", HOP));
+        out.write("<tr><td>");
+        out.write(_("Outbound Settings"));
+        out.write(":<td>");
+        out.write(renderOptions(1, 6, options.remove("outbound.quantity"), "outbound.quantity", TUNNEL));
+        out.write("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
+        out.write(renderOptions(0, 4, options.remove("outbound.length"), "outbound.length", HOP));
+
         out.write("<tr><td>");
         out.write(_("I2CP host"));
         out.write(": <td><input type=\"text\" name=\"i2cpHost\" value=\"" 
@@ -910,11 +1104,10 @@ public class I2PSnarkServlet extends HttpServlet {
 
         out.write("<tr><td>");
         out.write(_("I2CP port"));
-        out.write(": <td><input type=\"text\" name=\"i2cpPort\" value=\"" +
+        out.write(": <td><input type=\"text\" name=\"i2cpPort\" class=\"r\" value=\"" +
                   + _manager.util().getI2CPPort() + "\" size=\"5\" maxlength=\"5\" > <br>\n");
 
         StringBuilder opts = new StringBuilder(64);
-        Map options = new TreeMap(_manager.util().getI2CPOptions());
         for (Iterator iter = options.entrySet().iterator(); iter.hasNext(); ) {
             Map.Entry entry = (Map.Entry)iter.next();
             String key = (String)entry.getKey();
@@ -925,6 +1118,7 @@ public class I2PSnarkServlet extends HttpServlet {
         out.write(_("I2CP options"));
         out.write(": <td><textarea name=\"i2cpOpts\" cols=\"60\" rows=\"1\" wrap=\"off\" >"
                   + opts.toString() + "</textarea><br>\n");
+	
 
         out.write("<tr><td>&nbsp;<td><input type=\"submit\" value=\"");
         out.write(_("Save configuration"));
@@ -933,6 +1127,43 @@ public class I2PSnarkServlet extends HttpServlet {
         out.write("</form></div>");
     }
     
+    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(_("Configuration"));
+        out.write("</a></span></span></div>\n");
+    }
+
+    /** copied from ConfigTunnelsHelper */
+    private static final String HOP = "hop";
+    private static final String TUNNEL = "tunnel";
+    /** dummies for translation */
+    private static final String HOPS = ngettext("1 hop", "{0} hops");
+    private static final String TUNNELS = ngettext("1 tunnel", "{0} tunnels");
+    /** prevents the ngettext line below from getting tagged */
+    private static final String DUMMY0 = "{0} ";
+    private static final String DUMMY1 = "1 ";
+
+    /** modded from ConfigTunnelsHelper @since 0.7.14 */
+    private String renderOptions(int min, int max, String strNow, String selName, String name) {
+        int now = 2;
+        try {
+            now = Integer.parseInt(strNow);
+        } catch (Throwable t) {}
+        StringBuilder buf = new StringBuilder(128);
+        buf.append("<select name=\"").append(selName).append("\">\n");
+        for (int i = min; i <= max; i++) {
+            buf.append("<option value=\"").append(i).append("\" ");
+            if (i == now)
+                buf.append("selected=\"true\" ");
+            // constants to prevent tagging
+            buf.append(">").append(ngettext(DUMMY1 + name, DUMMY0 + name + 's', i));
+            buf.append("</option>\n");
+        }
+        buf.append("</select>\n");
+        return buf.toString();
+    }
+
     /** translate */
     private String _(String s) {
         return _manager.util().getString(s);
@@ -943,29 +1174,271 @@ public class I2PSnarkServlet extends HttpServlet {
         return _manager.util().getString(s, o);
     }
 
+    /** translate (ngettext) @since 0.7.14 */
+    private String ngettext(String s, String p, int n) {
+        return _manager.util().getString(n, s, p);
+    }
+
+    /** dummy for tagging */
+    private static String ngettext(String s, String p) {
+        return null;
+    }
+
     // rounding makes us look faster :)
-    private String formatSize(long bytes) {
+    private static String formatSize(long bytes) {
         if (bytes < 5*1024)
-            return bytes + "B";
+            return bytes + " B";
         else if (bytes < 5*1024*1024)
-            return ((bytes + 512)/1024) + "KB";
+            return ((bytes + 512)/1024) + " KB";
         else if (bytes < 10*1024*1024*1024l)
-            return ((bytes + 512*1024)/(1024*1024)) + "MB";
+            return ((bytes + 512*1024)/(1024*1024)) + " MB";
         else
-            return ((bytes + 512*1024*1024)/(1024*1024*1024)) + "GB";
+            return ((bytes + 512*1024*1024)/(1024*1024*1024)) + " GB";
     }
     
-    private static final String HEADER = "<link href=\"../themes/console/snark.css\" rel=\"stylesheet\" type=\"text/css\" >";
+    /** @since 0.7.14 */
+    private static String urlify(String s) {
+        StringBuilder buf = new StringBuilder(256);
+        buf.append("<a href=\"").append(s).append("\">").append(s).append("</a>");
+        return buf.toString();
+    }
+
+    private static final String HEADER = "<link href=\"/themes/console/snark.css\" rel=\"stylesheet\" type=\"text/css\" >";
                                        
 
     private static final String TABLE_HEADER = "<table border=\"0\" class=\"snarkTorrents\" width=\"100%\" cellpadding=\"0 10px\">\n" +
                                                "<thead>\n" +
                                                "<tr><th align=\"center\">";
 
-    private static final String TABLE_FOOTER = "</table></div>\n";
-    
     private static final String FOOTER = "</div></div></div></center></body></html>";
 
+    /**
+     * Modded heavily from the Jetty version in Resource.java,
+     * pass Resource as 1st param
+     * All the xxxResource constructors are package local so we can't extend them.
+     *
+     * <pre>
+      // ========================================================================
+      // $Id: Resource.java,v 1.32 2009/05/16 01:53:36 gregwilkins Exp $
+      // Copyright 1996-2004 Mort Bay Consulting Pty. Ltd.
+      // ------------------------------------------------------------------------
+      // Licensed under the Apache License, Version 2.0 (the "License");
+      // you may not use this file except in compliance with the License.
+      // You may obtain a copy of the License at 
+      // http://www.apache.org/licenses/LICENSE-2.0
+      // Unless required by applicable law or agreed to in writing, software
+      // distributed under the License is distributed on an "AS IS" BASIS,
+      // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      // See the License for the specific language governing permissions and
+      // limitations under the License.
+      // ========================================================================
+     * </pre>
+     *
+     * Get the resource list as a HTML directory listing.
+     * @param r The Resource
+     * @param base The base URL
+     * @param parent True if the parent directory should be included
+     * @return String of HTML
+     * @since 0.7.14
+     */
+    private String getListHTML(Resource r, String base, boolean parent)
+        throws IOException
+    {
+        if (!r.isDirectory())
+            return null;
+        
+        String[] ls = r.list();
+        if (ls==null)
+            return null;
+        Arrays.sort(ls, Collator.getInstance());
+        
+        StringBuilder buf=new StringBuilder(4096);
+        buf.append("<HTML><HEAD><TITLE>");
+        String title = URI.decodePath(base);
+        if (title.startsWith("/i2psnark/"))
+            title = title.substring("/i2psnark/".length());
+
+        // Get the snark associated with this directory
+        String torrentName;
+        int slash = title.indexOf('/');
+        if (slash > 0)
+            torrentName = title.substring(0, slash);
+        else
+            torrentName = title;
+        Snark snark = _manager.getTorrentByBaseName(torrentName);
+        if (title.endsWith("/"))
+            title = title.substring(0, title.length() - 1);
+        title = _("Torrent") + ": " + title;
+        buf.append(title);
+        buf.append("</TITLE>").append(HEADER).append("</HEAD><BODY>\n<div class=\"snarknavbar\">");
+        buf.append(title);
+        
+        if (parent)
+        {
+            buf.append("\n<br><A HREF=\"");
+            // corrupts utf-8
+            //buf.append(URI.encodePath(URI.addPaths(base,"../")));
+            buf.append(URI.addPaths(base,"../"));
+            buf.append("\"><img border=\"0\" src=\"/themes/console/images/outbound.png\"> ")
+               .append(_("Up to higher level directory")).append("</A>\n");
+        }
+        
+        buf.append("</div><div class=\"page\"><div class=\"mainsection\">" +
+                   "<TABLE BORDER=0 class=\"snarkTorrents\" cellpadding=\"5px 10px\">" +
+                   "<thead><tr><th>").append(_("File")).append("</th><th>").append(_("Size"))
+           .append("</th><th>").append(_("Status")).append("</th></tr></thead>");
+        //DateFormat dfmt=DateFormat.getDateTimeInstance(DateFormat.MEDIUM,
+        //                                               DateFormat.MEDIUM);
+        for (int i=0 ; i< ls.length ; i++)
+        {   
+            String encoded=URI.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
+            //Resource item = addPath(encoded);
+            Resource item = r.addPath(ls[i]);
+            
+            String rowClass = (i % 2 == 0 ? "snarkTorrentEven" : "snarkTorrentOdd");
+            buf.append("<TR class=\"").append(rowClass).append("\"><TD class=\"snarkFileName ")
+               .append(rowClass).append("\">");
+            
+            // Get completeness and status string
+            boolean complete = false;
+            String status = "";
+            long length = item.length();
+            if (item.isDirectory()) {
+                complete = true;
+                status = toImg("tick") + _("Directory");
+            } else {
+                if (snark == null) {
+                    // Assume complete, perhaps he removed a completed torrent but kept a bookmark
+                    complete = true;
+                    status = toImg("cancel") + _("Torrent not found?");
+                } else {
+                    try {
+                        File f = item.getFile();
+                        if (f != null) {
+                            long remaining = snark.storage.remaining(f.getCanonicalPath());
+                            if (remaining < 0) {
+                                complete = true;
+                                status = toImg("cancel") + _("File not found in torrent?");
+                            } else if (remaining == 0 || length <= 0) {
+                                complete = true;
+                                status = toImg("tick") + _("Complete");
+                            } else {
+                                status = toImg("clock") +
+                                         (100 * (length - remaining) / length) + "% " + _("complete") +
+                                         " (" + DataHelper.formatSize2(remaining) + _("bytes remaining") + ")";
+                            }
+                        } else {
+                            status = "Not a file?";
+                        }
+                    } catch (IOException ioe) {
+                        status = "Not a file? " + ioe;
+                    }
+                }
+            }
+
+            String path=URI.addPaths(base,encoded);
+            if (item.isDirectory() && !path.endsWith("/"))
+                path=URI.addPaths(path,"/");
+            String icon = toIcon(item);
+
+            if (complete) {
+                buf.append("<a href=\"").append(path).append("\">");
+                // thumbnail ?
+                String plc = item.toString().toLowerCase();
+                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=\"")
+                       .append(path).append("\"></a> ");
+                } else {
+                    buf.append(toImg(icon));
+                }
+                buf.append("<A HREF=\"");
+                buf.append(path);
+                buf.append("\">");
+            } else {
+                buf.append(toImg(icon));
+            }
+            buf.append(ls[i]);
+            if (complete)
+                buf.append("</a>");
+            buf.append("</TD><TD ALIGN=right class=\"").append(rowClass).append(" snarkFileSize\">");
+            if (!item.isDirectory())
+                buf.append(DataHelper.formatSize2(length)).append('B');
+            buf.append("</TD><TD class=\"").append(rowClass).append(" snarkFileStatus\">");
+            //buf.append(dfmt.format(new Date(item.lastModified())));
+            buf.append(status);
+            buf.append("</TD></TR>\n");
+        }
+        buf.append("</TABLE>\n");
+	buf.append("</div></div></BODY></HTML>\n");
+        
+        return buf.toString();
+    }
+
+    /** @since 0.7.14 */
+    private String toIcon(Resource item) {
+        if (item.isDirectory())
+            return "folder";
+        return toIcon(item.toString());
+    }
+
+    /**
+     *  Pick an icon; try to catch the common types in an i2p environment
+     *  @return file name not including ".png"
+     *  @since 0.7.14
+     */
+    private String toIcon(String path) {
+        String icon;
+        // Should really just add to the mime.properties file in org.mortbay.jetty.jar
+        // 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 mime = getServletContext().getMimeType(path);
+        if (mime == null)
+            mime = "";
+        if (mime.equals("text/html"))
+            icon = "html";
+        else if (mime.equals("text/plain") || plc.endsWith(".nfo"))
+            icon = "page";
+        else if (mime.equals("application/java-archive") || plc.endsWith(".war"))
+            icon = "package";
+        else if (plc.endsWith(".xpi2p"))
+            icon = "plugin";
+        else if (mime.equals("application/pdf"))
+            icon = "page_white_acrobat";
+        else if (mime.startsWith("image/") || plc.endsWith(".ico"))
+            icon = "photo";
+        else if (mime.startsWith("audio/") || mime.equals("application/ogg") ||
+                 plc.endsWith(".flac") || plc.endsWith(".m4a") || plc.endsWith(".wma") ||
+                 plc.endsWith(".ape"))
+            icon = "music";
+        else if (mime.startsWith("video/") || plc.endsWith(".mkv") || plc.endsWith(".m4v") ||
+                 plc.endsWith(".mp4") || plc.endsWith(".wmv") || plc.endsWith(".flv"))
+            icon = "film";
+        else if (mime.equals("application/zip") || mime.equals("application/x-gtar") ||
+                 mime.equals("application/compress") || mime.equals("application/gzip") ||
+                 mime.equals("application/x-tar") ||
+                 plc.endsWith(".rar") || plc.endsWith(".bz2") || plc.endsWith(".7z"))
+            icon = "compress";
+        else if (plc.endsWith(".exe"))
+            icon = "application";
+        else if (plc.endsWith(".iso"))
+            icon = "cd";
+        else
+            icon = "page_white";
+        return icon;
+    }
+    
+    /** @since 0.7.14 */
+    private static String toImg(String icon) {
+        return "<img alt=\"\" height=\"16\" width=\"16\" src=\"/i2psnark/_icons/" + icon + ".png\"> ";
+    }
+
+
 /** inner class, don't bother reindenting */
 private static class FetchAndAdd implements Runnable {
     private SnarkManager _manager;
@@ -980,7 +1453,7 @@ private static class FetchAndAdd implements Runnable {
         File file = _manager.util().get(_url, false, 3);
         try {
             if ( (file != null) && (file.exists()) && (file.length() > 0) ) {
-                _manager.addMessage(_("Torrent fetched from {0}", _url));
+                _manager.addMessage(_("Torrent fetched from {0}", urlify(_url)));
                 FileInputStream in = null;
                 try {
                     in = new FileInputStream(file);
@@ -1008,12 +1481,12 @@ private static class FetchAndAdd implements Runnable {
                         _manager.addTorrent(canonical);
                     }
                 } catch (IOException ioe) {
-                    _manager.addMessage(_("Torrent at {0} was not valid", _url) + ": " + ioe.getMessage());
+                    _manager.addMessage(_("Torrent at {0} was not valid", urlify(_url)) + ": " + ioe.getMessage());
                 } finally {
                     try { in.close(); } catch (IOException ioe) {}
                 }
             } else {
-                _manager.addMessage(_("Torrent was not retrieved from {0}", _url));
+                _manager.addMessage(_("Torrent was not retrieved from {0}", urlify(_url)));
             }
         } finally {
             if (file != null) file.delete();

apps/i2psnark/locale/messages_nl.po

@@ -0,0 +1,775 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2psnark package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# foo <foo@bar>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P i2psnark\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-07-05 11:48+0000\n"
+"PO-Revision-Date: 2010-06-15 09:07+0100\n"
+"Last-Translator: duck <duck@mail.i2p>\n"
+"Language-Team: duck <duck@mail.i2p>, monkeybrains <monkeybrains@mail.i2p>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Dutch\n"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:88
+#, java-format
+msgid "Adding torrents in {0} minutes"
+msgstr "Torrents toevoegen in {0} minuten"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:258
+#, java-format
+msgid "Total uploaders limit changed to {0}"
+msgstr "Totale uploaders limiet gewijzigd in {0}"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:260
+#, java-format
+msgid "Minimum total uploaders limit is {0}"
+msgstr "Minimum totale uploaders limiet is {0}"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:272
+#, java-format
+msgid "Up BW limit changed to {0}KBps"
+msgstr "Up bandbreedte limiet gewijzigd in {0}KBps"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:274
+#, java-format
+msgid "Minimum up bandwidth limit is {0}KBps"
+msgstr "Minimum up bandbreedte limiet is {0}KBps"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:286
+#, java-format
+msgid "Startup delay limit changed to {0} minutes"
+msgstr "Startup vertragings limiet gewijzigd in {0} minuten"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:333
+msgid "I2CP and tunnel changes will take effect after stopping all torrents"
+msgstr "I2CP en tunnel wijzigingen hebben pas effect na het stoppen van alle torrents"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:339
+msgid "Disconnecting old I2CP destination"
+msgstr "Oude I2CP destination wordt afgesloten"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:343
+#, java-format
+msgid "I2CP settings changed to {0}"
+msgstr "I2CP instellingen gewijzigd in {0}"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:347
+msgid ""
+"Unable to connect with the new settings, reverting to the old I2CP settings"
+msgstr "Kan geen connectie maken met de nieuwe instellingen, we keren terug naar oude I2CP instellingen"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:351
+msgid "Unable to reconnect with the old settings!"
+msgstr "Kan niet opnieuw verbinden met de oude instellingen!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:353
+msgid "Reconnected on the new I2CP destination"
+msgstr "Opnieuw verbonden met de nieuwe I2CP destination"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:364
+#, java-format
+msgid "I2CP listener restarted for \"{0}\""
+msgstr "I2CP listener herstart voor \"{0}\""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:375
+msgid "Enabled autostart"
+msgstr "Autostart ingeschakeld"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:377
+msgid "Disabled autostart"
+msgstr "Autostart uitgeschakeld"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:383
+msgid "Enabled open trackers - torrent restart required to take effect."
+msgstr "Open Trackers ingeschakeld - torrent herstart nodig."
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:385
+msgid "Disabled open trackers - torrent restart required to take effect."
+msgstr "Open Trackers uitgeschakeld - torrent herstart nodig."
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:392
+msgid "Open Tracker list changed - torrent restart required to take effect."
+msgstr "Open Tracker lijst gewijzigd - torrent herstart nodig."
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:399
+msgid "Configuration unchanged."
+msgstr "Configuratie ongewijzigd."
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:409
+#, java-format
+msgid "Unable to save the config to {0}"
+msgstr "Kan de configuratie niet opslaan in {0}"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:445
+msgid "Connecting to I2P"
+msgstr "Verbinden met I2P"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:448
+msgid "Error connecting to I2P - check your I2CP settings!"
+msgstr "Fout bij verbinden met I2P - controlleer je I2CP instellingen!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:457
+#, java-format
+msgid "Error: Could not add the torrent {0}"
+msgstr "Fout: Kan de torrent {0} niet toevoegen"
+
+#. catch this here so we don't try do delete it below
+#: ../java/src/org/klomp/snark/SnarkManager.java:479
+#, java-format
+msgid "Cannot open \"{0}\""
+msgstr "Kan \"{0}\" niet openen"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:492
+#, java-format
+msgid ""
+"Warning - Ignoring non-i2p tracker in \"{0}\", will announce to i2p open "
+"trackers only"
+msgstr "Waarschuwing - Niet-I2P tracker in \"{0}\" wordt genegeerd, zal alleen aankondigen naar i2p open trackers"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:494
+#, java-format
+msgid ""
+"Warning - Ignoring non-i2p tracker in \"{0}\", and open trackers are "
+"disabled, you must enable open trackers before starting the torrent!"
+msgstr "Waarschuwing - Niet-I2P tracker in \"{0}\" wordt genegeerd, en open trackers zijn uitgeschakeld, je moet open trackers inschakelen voor het starten van de torrent!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:513
+#, java-format
+msgid "Torrent in \"{0}\" is invalid"
+msgstr "Torrent in \"{0}\" is ongeldig"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:528
+#, java-format
+msgid "Torrent added and started: \"{0}\""
+msgstr "Torrent toegevoegd en gestart: \"{0}\""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:530
+#, java-format
+msgid "Torrent added: \"{0}\""
+msgstr "Torrent toegevoegd: \"{0}\""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:627
+#, java-format
+msgid "Too many files in \"{0}\" ({1}), deleting it!"
+msgstr "Te veel bestanden in \"{0}\" ({1}), wordt verwijderd!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:629
+#, java-format
+msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
+msgstr "Torrent bestand \"{0}\" kan niet eindigen in \".torrent\", wordt verwijderd!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:631
+#, java-format
+msgid "No pieces in \"{0}\",  deleting it!"
+msgstr "Geen stukken in \"{0}\",  wordt verwijderd!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:633
+#, java-format
+msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
+msgstr "Te veel stukken in \"{0}\", limiet is {1}, wordt verwijderd!"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:635
+#, java-format
+msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
+msgstr "Stukken zijn te groot in \"{0}\" ({1}B), wordt verwijderd."
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:636
+#, java-format
+msgid "Limit is {0}B"
+msgstr "Limiet is {0}B"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:644
+#, java-format
+msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
+msgstr "Torrents groter dan {0}B worden nog niet ondersteund, verwijder \"{1}\""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:660
+#, java-format
+msgid "Error: Could not remove the torrent {0}"
+msgstr "Fout: Kan de torrent {0} niet verwijderen"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:681
+#, java-format
+msgid "Torrent stopped: \"{0}\""
+msgstr "Torrent gestopt: \"{0}\""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:696
+#, java-format
+msgid "Torrent removed: \"{0}\""
+msgstr "Torrent verwijderd: \"{0}\""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:729
+#, java-format
+msgid "Download finished: \"{0}\""
+msgstr "Download gereed: \"{0}\""
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:729
+#, java-format
+msgid "size: {0}B"
+msgstr "grootte: {0}B"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:757
+msgid "Unable to connect to I2P!"
+msgstr "Kan niet verbinden met I2P!"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:174
+msgid "I2PSnark - Anonymous BitTorrent Client"
+msgstr "I2PSnark - Anonieme BitTorrent Client"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:185
+msgid "Torrents"
+msgstr "Torrents"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:187
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:193
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:837
+msgid "I2PSnark"
+msgstr "I2PSnark"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:191
+msgid "Refresh page"
+msgstr "Ververs pagina"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:195
+msgid "Forum"
+msgstr "Forum"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:240
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1289
+msgid "Status"
+msgstr "Status"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:246
+msgid "Hide Peers"
+msgstr "Verberg Peers"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:249
+msgid "Show Peers"
+msgstr "Toon Peers"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:254
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
+msgid "Torrent"
+msgstr "Torrent"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:256
+msgid "ETA"
+msgstr "ETA"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:258
+msgid "Downloaded"
+msgstr "Gedownload"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:260
+msgid "Uploaded"
+msgstr "Geupload"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:262
+msgid "Down Rate"
+msgstr "Down Snelheid"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:264
+msgid "Up Rate"
+msgstr "Up Snelheid"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:271
+msgid "Stop all torrents and the I2P tunnel"
+msgstr "Stop alle torrents en de I2P tunnel"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273
+msgid "Stop All"
+msgstr "Stop Alle"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:278
+msgid "Start all torrents and the I2P tunnel"
+msgstr "Start alle torrents en de I2P tunnel"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:280
+msgid "Start All"
+msgstr "Start Alle"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:297
+msgid "No torrents loaded."
+msgstr "Geen torrents geladen."
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:302
+msgid "Totals"
+msgstr "Totalen"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:304
+#, java-format
+msgid "1 torrent"
+msgid_plural "{0} torrents"
+msgstr[0] "1 torrent"
+msgstr[1] "{0} torrents"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:307
+#, java-format
+msgid "1 connected peer"
+msgid_plural "{0} connected peers"
+msgstr[0] "1 verbonden peer"
+msgstr[1] "{0} verbonden peers"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:336
+#, java-format
+msgid "Torrent file {0} does not exist"
+msgstr "Torrent bestand {0} bestaat niet"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:346
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1476
+#, java-format
+msgid "Torrent already running: {0}"
+msgstr "Torrent draait al: {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:348
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1478
+#, java-format
+msgid "Torrent already in the queue: {0}"
+msgstr "Torrent zit al in de wachtrij: {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:352
+#, java-format
+msgid "Copying torrent to {0}"
+msgstr "Kopieer torrent naar {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:355
+#, java-format
+msgid "Unable to copy the torrent to {0}"
+msgstr "Kan de de torrent niet kopieren naar {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:355
+#, java-format
+msgid "from {0}"
+msgstr "van {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:363
+#, java-format
+msgid "Fetching {0}"
+msgstr "Downloaden {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:367
+msgid "Invalid URL - must start with http://"
+msgstr "Ongeldige URL - moet beginnen met http://"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:397
+#, java-format
+msgid "Starting up torrent {0}"
+msgstr "Starten met torrent {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:417
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:435
+#, java-format
+msgid "Torrent file deleted: {0}"
+msgstr "Torrent bestand verwijderd: {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:441
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451
+#, java-format
+msgid "Data file deleted: {0}"
+msgstr "Data bestand verwijderd: {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:443
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:453
+#, java-format
+msgid "Data file could not be deleted: {0}"
+msgstr "Kan data bestand niet verwijderen: {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:462
+#, java-format
+msgid "Data dir deleted: {0}"
+msgstr "Data directory verwijderd: {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:494
+msgid "Error creating torrent - you must select a tracker"
+msgstr "Fout bij maken van torrent - je moet een tracker selecteren"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509
+#, java-format
+msgid "Torrent created for \"{0}\""
+msgstr "Torrent gemaakt voor \"{0}\""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512
+#, java-format
+msgid ""
+"Many I2P trackers require you to register new torrents before seeding - "
+"please do so before starting \"{0}\""
+msgstr "Veel I2P trackers vereisen dat je de nieuwe torrent registreert voor het seeden - "
+"doe dit voordat je \"{0}\" start"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:514
+#, java-format
+msgid "Error creating a torrent for \"{0}\""
+msgstr "Fout bij het maken van een torrent voor \"{0}\""
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:517
+#, java-format
+msgid "Cannot create a torrent for the nonexistent data: {0}"
+msgstr "Kan geen torrent maken voor niet-bestaande data: {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:520
+msgid "Error creating torrent - you must enter a file or directory"
+msgstr "Fout bij het maken van de torrent - je moet een bestand of directory invullen"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:523
+msgid "Stopping all torrents and closing the I2P tunnel."
+msgstr "Stoppen van alle torrents en sluiten van I2P tunnel."
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:532
+msgid "I2P tunnel closed."
+msgstr "I2P tunnel gesloten."
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535
+msgid "Opening the I2P tunnel and starting all torrents."
+msgstr "Openen van de I2P tunnel en starten van alle torrents."
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:657
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:851
+msgid "Unknown"
+msgstr "Onbekend"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:660
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:665
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:670
+msgid "TrackerErr"
+msgstr "TrackerErr"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:666
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:677
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:688
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:691
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:696
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:699
+#, java-format
+msgid "1 peer"
+msgid_plural "{0} peers"
+msgstr[0] "1 peer"
+msgstr[1] "{0} peers"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:674
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:679
+msgid "Seeding"
+msgstr "Seeding"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:682
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1327
+msgid "Complete"
+msgstr "Voltooid"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:685
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:690
+msgid "OK"
+msgstr "OK"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:693
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
+msgid "Stalled"
+msgstr "Vastgelopen"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:701
+msgid "No Peers"
+msgstr "Geen Peers"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:703
+msgid "Stopped"
+msgstr "Gestopt"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:718
+msgid "View files"
+msgstr "Bekijk bestanden"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:720
+msgid "Open file"
+msgstr "Open bestand"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:750
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:967
+msgid "Tracker"
+msgstr "Tracker"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:751
+msgid "Details"
+msgstr "Details"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:785
+msgid "Stop the torrent"
+msgstr "Stop de torrent"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:787
+msgid "Stop"
+msgstr "Stop"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:793
+msgid "Start the torrent"
+msgstr "Start de torrent"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:795
+msgid "Start"
+msgstr "Start"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:800
+msgid "Remove the torrent from the active list, deleting the .torrent file"
+msgstr "Verwijder de torrent van de actieve lijst, het .torrent bestand wordt verwijderd"
+
+#. Can't figure out how to escape double quotes inside the onclick string.
+#. Single quotes in translate strings with parameters must be doubled.
+#. Then the remaining single quite must be escaped
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:805
+#, java-format
+msgid ""
+"Are you sure you want to delete the file \\''{0}.torrent\\'' (downloaded "
+"data will not be deleted) ?"
+msgstr "Weet je zeker dat je het bestand \\''{0}.torrent\\'' wilt verwijderen (gedownloade data zal niet worden verwijderd) ?"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:807
+msgid "Remove"
+msgstr "Weghalen"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
+msgid "Delete the .torrent file and the associated data file(s)"
+msgstr "Verwijder het .torrent bestand en de gerelateerde data bestand(en)"
+
+#. Can't figure out how to escape double quotes inside the onclick string.
+#. Single quotes in translate strings with parameters must be doubled.
+#. Then the remaining single quite must be escaped
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:816
+#, java-format
+msgid ""
+"Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded "
+"data?"
+msgstr "Weet je zeker dat je de torrent \\''{0}\\'' en alle gedownloade data wilt verwijderen?"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:818
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:861
+msgid "Seed"
+msgstr "Seed"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:879
+msgid "Uninteresting (The peer has no pieces we need)"
+msgstr "Niet interessant (De peer heeft geen stukken die we nodig hebben)"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:881
+msgid "Choked (The peer is not allowing us to request pieces)"
+msgstr "Verstikt (De peer laat ons niet toe om stukken op te vragen)"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:895
+msgid "Uninterested (We have no pieces the peer needs)"
+msgstr "Niet geïnteresseerd (We heben geen stukken die de peer nodig heeft)"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:897
+msgid "Choking (We are not allowing the peer to request pieces)"
+msgstr "Verstikt (We laten de peer niet toe om stukken op te vragen)"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:927
+msgid "Add Torrent"
+msgstr "Torrent Toevoegen"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:929
+msgid "From URL"
+msgstr "Van URL"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:934
+msgid "Add torrent"
+msgstr "Torrent toevoegen"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:937
+#, java-format
+msgid "Alternately, you can copy .torrent files to the directory {0}."
+msgstr "Als alternatief kan je het .torrent bestand kopieren naar de directory {0}."
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:939
+msgid "Removing a .torrent file will cause the torrent to stop."
+msgstr "Verwijderen van een .torrent bestand zorgt dat de torrent stopt."
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958
+msgid "Create Torrent"
+msgstr "Creëer Torrent"
+
+#. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\" value=\"" + newFile + "\" /><br>\n");
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:961
+msgid "Data to seed"
+msgstr "Data om te seeden"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:965
+msgid "File or directory to seed (must be within the specified path)"
+msgstr "Bestand of directory om te seeden (moet binnen het gespecificeerde pad zijn)"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:969
+msgid "Select a tracker"
+msgstr "Selecteer een tracker"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:982
+msgid "or"
+msgstr "of"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985
+msgid "Specify custom tracker announce URL"
+msgstr "Specificeer aangepaste tracker aankondigings URL"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:988
+msgid "Create torrent"
+msgstr "Creëer torrent"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1006
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1133
+msgid "Configuration"
+msgstr "Configuratie"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1009
+msgid "Data directory"
+msgstr "Data directory"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1012
+msgid "Directory to store torrents and data"
+msgstr "Directory om torrents en data op te slaan"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014
+msgid "Edit i2psnark.config and restart to change"
+msgstr "Bewerk i2psnark.config en herstart de wijziging"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1018
+msgid "Auto start"
+msgstr "Auto start"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022
+msgid "If checked, automatically start torrents that are added"
+msgstr "Indien aangevinkt, start toegevoegde torrents automatisch"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1026
+msgid "Startup delay"
+msgstr "Startup vertraging"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1028
+msgid "minutes"
+msgstr "minuten"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1052
+msgid "Total uploader limit"
+msgstr "Totale uploader limiet"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055
+msgid "peers"
+msgstr "peers"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1059
+msgid "Up bandwidth limit"
+msgstr "Up bandbreedte limiet"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1062
+msgid "Half available bandwidth recommended."
+msgstr "Helft van beschikbare bandbreedte aanbevolen."
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1064
+msgid "View or change router bandwidth"
+msgstr "Bekijk of wijzig router bandbreedte"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068
+msgid "Use open trackers also"
+msgstr "Gebruik ook open trackers"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1072
+msgid ""
+"If checked, announce torrents to open trackers as well as the tracker listed "
+"in the torrent file"
+msgstr "Indien aangevinkt, kondig torrents ook aan bij de tracker uit het torrent bestand"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1076
+msgid "Open tracker announce URLs"
+msgstr "Open tracker aankondigings URLs"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1088
+msgid "Inbound Settings"
+msgstr "Inkomende Instellingen"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
+msgid "Outbound Settings"
+msgstr "Uitgaande Instellingen"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1101
+msgid "I2CP host"
+msgstr "I2CP host"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1106
+msgid "I2CP port"
+msgstr "I2CP poort"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1118
+msgid "I2CP options"
+msgstr "I2CP opties"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1124
+msgid "Save configuration"
+msgstr "Configuratie opslaan"
+
+#. * dummies for translation
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1141
+#, java-format
+msgid "1 hop"
+msgid_plural "{0} hops"
+msgstr[0] "1 hop"
+msgstr[1] "{0} hops"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142
+#, java-format
+msgid "1 tunnel"
+msgid_plural "{0} tunnels"
+msgstr[0] "1 tunnel"
+msgstr[1] "{0} tunnels"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1283
+msgid "Up to higher level directory"
+msgstr "Naar bovenliggende directory"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
+msgid "File"
+msgstr "Bestand"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
+msgid "Size"
+msgstr "Grootte"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1311
+msgid "Directory"
+msgstr "Directory"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1316
+msgid "Torrent not found?"
+msgstr "Torrent niet gevonden?"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1324
+msgid "File not found in torrent?"
+msgstr "Bestand niet gevonden in torrent?"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1330
+msgid "complete"
+msgstr "voltooid"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1331
+msgid "bytes remaining"
+msgstr "bytes resterend"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1456
+#, java-format
+msgid "Torrent fetched from {0}"
+msgstr "Torrent gedownload van {0}"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1484
+#, java-format
+msgid "Torrent at {0} was not valid"
+msgstr "Torrent op {0} was niet geldig"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489
+#, java-format
+msgid "Torrent was not retrieved from {0}"
+msgstr "Torrent was niet ontvangen van {0}"

apps/i2psnark/locale/messages_ru.po

@@ -8,660 +8,764 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P i2psnark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-13 09:42+0000\n"
-"PO-Revision-Date: 2010-03-13 09:44+0000\n"
+"POT-Creation-Date: 2010-06-26 21:02+0000\n"
+"PO-Revision-Date: 2010-06-26 21:13+0000\n"
 "Last-Translator: 4get <forget@mail.i2p>\n"
 "Language-Team: foo <foo@bar>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Russian\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:84
+#: ../java/src/org/klomp/snark/SnarkManager.java:88
 #, java-format
 msgid "Adding torrents in {0} minutes"
 msgstr "Торренты будут подгружены через {0} минут(ы)"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:242
+#: ../java/src/org/klomp/snark/SnarkManager.java:258
 #, java-format
 msgid "Total uploaders limit changed to {0}"
 msgstr "Новое значение лимита количества слотов отдачи: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:244
+#: ../java/src/org/klomp/snark/SnarkManager.java:260
 #, java-format
 msgid "Minimum total uploaders limit is {0}"
 msgstr "Минимально допустимое значение для количества слотов: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:256
+#: ../java/src/org/klomp/snark/SnarkManager.java:272
 #, java-format
 msgid "Up BW limit changed to {0}KBps"
 msgstr "Новое значение лимита скорости отдачи: {0} KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:258
+#: ../java/src/org/klomp/snark/SnarkManager.java:274
 #, java-format
 msgid "Minimum up bandwidth limit is {0}KBps"
 msgstr "Минимально допустимое значение для лимита скорости отдачи: {0} KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:302
-msgid "Cannot change the I2CP settings while torrents are active"
-msgstr "Невозможно изменить настройки I2CP пока есть активные торренты"
+#: ../java/src/org/klomp/snark/SnarkManager.java:286
+#, java-format
+msgid "Startup delay limit changed to {0} minutes"
+msgstr "Новое значение задержки запуска: {0} минут(ы)"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:308
+#: ../java/src/org/klomp/snark/SnarkManager.java:333
+msgid "I2CP and tunnel changes will take effect after stopping all torrents"
+msgstr "Изменения настроек I2CP и туннелей вступят в силу после остановки всех торрентов."
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:339
 msgid "Disconnecting old I2CP destination"
 msgstr "Рассоединяемся по старому адресу I2CP"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:312
+#: ../java/src/org/klomp/snark/SnarkManager.java:343
 #, java-format
 msgid "I2CP settings changed to {0}"
 msgstr "Новые параметры I2CP: {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:316
+#: ../java/src/org/klomp/snark/SnarkManager.java:347
 msgid "Unable to connect with the new settings, reverting to the old I2CP settings"
 msgstr "Не удалось соединиться с использованием новых настроек I2CP, возвращаемся к старым настройкам"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:320
+#: ../java/src/org/klomp/snark/SnarkManager.java:351
 msgid "Unable to reconnect with the old settings!"
 msgstr "Не удалось пересоединиться с использованием старых настроек I2CP!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:322
+#: ../java/src/org/klomp/snark/SnarkManager.java:353
 msgid "Reconnected on the new I2CP destination"
 msgstr "Пересоединились по новому адресу I2CP"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:333
+#: ../java/src/org/klomp/snark/SnarkManager.java:364
 #, java-format
 msgid "I2CP listener restarted for \"{0}\""
 msgstr "I2CP-приёмник перезапущен для \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:344
+#: ../java/src/org/klomp/snark/SnarkManager.java:375
 msgid "Enabled autostart"
 msgstr "Автостарт включен"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:346
+#: ../java/src/org/klomp/snark/SnarkManager.java:377
 msgid "Disabled autostart"
 msgstr "Автостарт выключен"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:352
+#: ../java/src/org/klomp/snark/SnarkManager.java:383
 msgid "Enabled open trackers - torrent restart required to take effect."
 msgstr "Включено использование открытых трекеров. Требуется перезапуск торрента, чтобы изменения вступили в силу."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:354
+#: ../java/src/org/klomp/snark/SnarkManager.java:385
 msgid "Disabled open trackers - torrent restart required to take effect."
 msgstr "Отключено использование открытых трекеров. Требуется перезапуск торрента, чтобы изменения вступили в силу."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:361
+#: ../java/src/org/klomp/snark/SnarkManager.java:392
 msgid "Open Tracker list changed - torrent restart required to take effect."
 msgstr "Изменен список открытых трекеров. Требуется перезапуск торрента, чтобы изменения вступили в силу."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:368
+#: ../java/src/org/klomp/snark/SnarkManager.java:399
 msgid "Configuration unchanged."
 msgstr "Настройки не изменились."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:378
+#: ../java/src/org/klomp/snark/SnarkManager.java:409
 #, java-format
 msgid "Unable to save the config to {0}"
 msgstr "Не удалось сохранить настройки в {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:396
+#: ../java/src/org/klomp/snark/SnarkManager.java:445
 msgid "Connecting to I2P"
 msgstr "Устанавливается соединение с I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:399
+#: ../java/src/org/klomp/snark/SnarkManager.java:448
 msgid "Error connecting to I2P - check your I2CP settings!"
 msgstr "Ошибка соединения с I2P, проверьте настройки I2CP!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:408
+#: ../java/src/org/klomp/snark/SnarkManager.java:457
 #, java-format
 msgid "Error: Could not add the torrent {0}"
 msgstr "Ошибка: Не удалось добавить торрент {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:430
+#. catch this here so we don't try do delete it below
+#: ../java/src/org/klomp/snark/SnarkManager.java:479
 #, java-format
 msgid "Cannot open \"{0}\""
 msgstr "Не удалось открыть \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:443
+#: ../java/src/org/klomp/snark/SnarkManager.java:492
 #, java-format
 msgid "Warning - Ignoring non-i2p tracker in \"{0}\", will announce to i2p open trackers only"
 msgstr "Внимание: указанные в \"{0}\" не-i2p трекеры будут проигнорированы, будут использоваться только открытые i2p трекеры"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:445
+#: ../java/src/org/klomp/snark/SnarkManager.java:494
 #, java-format
 msgid "Warning - Ignoring non-i2p tracker in \"{0}\", and open trackers are disabled, you must enable open trackers before starting the torrent!"
 msgstr "Внимание: указанные в \"{0}\" не-i2p трекеры будут проигнорированы, однако использование открытых i2p трекеров отключено, Вы должны включить поддержку открытых i2p трекеров перед запуском этого торрента!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:464
+#: ../java/src/org/klomp/snark/SnarkManager.java:513
 #, java-format
 msgid "Torrent in \"{0}\" is invalid"
 msgstr "Торрент в \"{0}\" некорректен"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:479
+#: ../java/src/org/klomp/snark/SnarkManager.java:528
 #, java-format
 msgid "Torrent added and started: \"{0}\""
 msgstr "Торрент добавлен и запущен: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:481
+#: ../java/src/org/klomp/snark/SnarkManager.java:530
 #, java-format
 msgid "Torrent added: \"{0}\""
 msgstr "Торрент добавлен: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:578
+#: ../java/src/org/klomp/snark/SnarkManager.java:627
 #, java-format
 msgid "Too many files in \"{0}\" ({1}), deleting it!"
 msgstr "Слишком много файлов в торренте \"{0}\" ({1}), удаляем его!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:580
+#: ../java/src/org/klomp/snark/SnarkManager.java:629
 #, java-format
 msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
 msgstr "Торрент \"{0}\" содержит единственный файл заканчивающийся на \".torrent\", удаляем его!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:582
+#: ../java/src/org/klomp/snark/SnarkManager.java:631
 #, java-format
 msgid "No pieces in \"{0}\",  deleting it!"
 msgstr "В торренте \"{0}\" не оказалось ни одной части, удаляем его!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:584
+#: ../java/src/org/klomp/snark/SnarkManager.java:633
 #, java-format
 msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
 msgstr "Слишком много частей в торренте \"{0}\" (наш предел {1}), удаляем его!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:586
+#: ../java/src/org/klomp/snark/SnarkManager.java:635
 #, java-format
 msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
 msgstr "Слишком крупные части в торренте \"{0}\" ({1}B), удаляем его."
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:587
+#: ../java/src/org/klomp/snark/SnarkManager.java:636
 #, java-format
 msgid "Limit is {0}B"
 msgstr "Наш предел {0}B"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:595
+#: ../java/src/org/klomp/snark/SnarkManager.java:644
 #, java-format
 msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
 msgstr "Торренты крупнее чем {0}B пока не поддерживается, удаляем \"{1}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:611
+#: ../java/src/org/klomp/snark/SnarkManager.java:660
 #, java-format
 msgid "Error: Could not remove the torrent {0}"
 msgstr "Ошибка: Невозможно удалить торрент {0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:632
+#: ../java/src/org/klomp/snark/SnarkManager.java:681
 #, java-format
 msgid "Torrent stopped: \"{0}\""
 msgstr "Торрент остановлен: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:647
+#: ../java/src/org/klomp/snark/SnarkManager.java:696
 #, java-format
 msgid "Torrent removed: \"{0}\""
 msgstr "Торрент удален: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:680
+#: ../java/src/org/klomp/snark/SnarkManager.java:729
 #, java-format
 msgid "Download finished: \"{0}\""
 msgstr "Завершена загрузка: \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:680
+#: ../java/src/org/klomp/snark/SnarkManager.java:729
 #, java-format
 msgid "size: {0}B"
 msgstr "размер: {0}B"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:708
+#: ../java/src/org/klomp/snark/SnarkManager.java:757
 msgid "Unable to connect to I2P!"
 msgstr "Не удалось установить соединение с I2P!"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:86
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:168
 msgid "I2PSnark - Anonymous BitTorrent Client"
 msgstr "I2PSnark — Анонимный  BitTorrent Клиент"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:95
-msgid "Refresh page"
-msgstr "Обновить страницу"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:179
+msgid "Torrents"
+msgstr "Торренты"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:97
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:669
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:181
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:187
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:831
 msgid "I2PSnark"
 msgstr "I2PSnark"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:99
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:185
+msgid "Refresh page"
+msgstr "Обновить страницу"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:189
 msgid "Forum"
 msgstr "Форум"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:125
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:234
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1283
 msgid "Status"
 msgstr "Статус"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:131
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:240
 msgid "Hide Peers"
 msgstr "спрятать список пиров"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:134
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:243
 msgid "Show Peers"
 msgstr "показать список пиров"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:139
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:248
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1265
 msgid "Torrent"
 msgstr "Торрент"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:141
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:250
 msgid "ETA"
 msgstr "Осталось"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:143
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:252
 msgid "Downloaded"
 msgstr "Получено"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:145
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:254
 msgid "Uploaded"
 msgstr "Отдано"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:147
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:256
 msgid "Down Rate"
 msgstr "Скорость загрузки"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:149
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:258
 msgid "Up Rate"
 msgstr "Скорость отдачи"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:156
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:265
 msgid "Stop all torrents and the I2P tunnel"
 msgstr "Остановить все торренты и закрыть соединение с I2P"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:158
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:267
 msgid "Stop All"
 msgstr "Остановить все"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:163
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:272
 msgid "Start all torrents and the I2P tunnel"
 msgstr "Запустить все торренты и открыть соединение с I2P"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:165
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:274
 msgid "Start All"
 msgstr "Запустить все"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:182
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:291
 msgid "No torrents loaded."
 msgstr "Нет загруженных торрентов."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:187
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:296
 msgid "Totals"
 msgstr "Всего"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:189
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:298
 #, java-format
-msgid "{0} torrents"
-msgstr "{0} торрентов"
+msgid "1 torrent"
+msgid_plural "{0} torrents"
+msgstr[0] "{0} торрент"
+msgstr[1] "{0} торрента"
+msgstr[2] "{0} торрентов"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:192
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:301
 #, java-format
-msgid "{0} connected peers"
-msgstr "{0} подсоединенных пиров"
+msgid "1 connected peer"
+msgid_plural "{0} connected peers"
+msgstr[0] "{0} подсоединенный пир"
+msgstr[1] "{0} подсоединенных пиров"
+msgstr[2] "{0} подсоединенных пиров"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:227
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:330
 #, java-format
 msgid "Torrent file {0} does not exist"
 msgstr "Торрент {0} не существует"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:237
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1003
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:340
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1470
 #, java-format
 msgid "Torrent already running: {0}"
 msgstr "Торрент уже запущен: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:239
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1005
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:342
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1472
 #, java-format
 msgid "Torrent already in the queue: {0}"
 msgstr "Торрент уже в очереди: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:243
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:346
 #, java-format
 msgid "Copying torrent to {0}"
 msgstr "Копируем торрент в: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:246
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:349
 #, java-format
 msgid "Unable to copy the torrent to {0}"
 msgstr "Не удалось скопировать торрент в: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:246
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:349
 #, java-format
 msgid "from {0}"
 msgstr "из: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:254
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:357
 #, java-format
 msgid "Fetching {0}"
 msgstr "Получение торрента: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:258
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:361
 msgid "Invalid URL - must start with http://"
 msgstr "Некорректный URL, должен начинаться с http://"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:288
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:391
 #, java-format
 msgid "Starting up torrent {0}"
 msgstr "Запускаем торрент: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:308
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:326
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:411
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:429
 #, java-format
 msgid "Torrent file deleted: {0}"
 msgstr "Удален торрент: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:332
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:342
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:435
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:445
 #, java-format
 msgid "Data file deleted: {0}"
 msgstr "Файл удален: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:334
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:344
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:437
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:447
 #, java-format
 msgid "Data file could not be deleted: {0}"
 msgstr "Не удалось удалить файл: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:353
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:456
 #, java-format
 msgid "Data dir deleted: {0}"
 msgstr "Директория удалена: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:384
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:488
 msgid "Error creating torrent - you must select a tracker"
 msgstr "Торрент не создан — вы должны указать трекер"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:399
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:503
 #, java-format
 msgid "Torrent created for \"{0}\""
 msgstr "Создан торрент для \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:402
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:506
 #, java-format
 msgid "Many I2P trackers require you to register new torrents before seeding - please do so before starting \"{0}\""
 msgstr "Многие I2P трекеры требуют зарегистрировать на них торрент перед началом раздачи — пожалуйста проверьте требуется ли это перед запуском \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:404
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508
 #, java-format
 msgid "Error creating a torrent for \"{0}\""
 msgstr "Ошибка при создании торрента для: \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:407
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511
 #, java-format
 msgid "Cannot create a torrent for the nonexistent data: {0}"
 msgstr "Невозможно создать торрент для несуществующего файла или директории: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:410
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:514
 msgid "Error creating torrent - you must enter a file or directory"
 msgstr "Торрент не создан — вы должны указать файл или директорию"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:413
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:517
 msgid "Stopping all torrents and closing the I2P tunnel."
 msgstr "Останавливаем все торренты и закрываем соединение с I2P"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:422
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:526
 msgid "I2P tunnel closed."
 msgstr "Соединение с I2P закрыто."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:425
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:529
 msgid "Opening the I2P tunnel and starting all torrents."
 msgstr "Соединяемся с I2P и запускаем все торренты."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:505
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:683
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:651
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:845
 msgid "Unknown"
 msgstr "Неизвестный"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:516
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:654
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:659
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:664
 msgid "TrackerErr"
 msgstr "ОшибкаТрекера"
 
 # TODO should replace "uploader limit NN peers" with "global number of upload slots: NN"
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:522
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:524
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:531
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:533
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:539
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:875
-msgid "peers"
-msgstr "пир."
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:657
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:660
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:671
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:674
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:682
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:685
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:690
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:693
+#, java-format
+msgid "1 peer"
+msgid_plural "{0} peers"
+msgstr[0] "{0} пир"
+msgstr[1] "{0} пира"
+msgstr[2] "{0} пиров"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:520
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:524
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:668
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673
 msgid "Seeding"
 msgstr "Раздается"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:526
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:676
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1321
 msgid "Complete"
 msgstr "Завершен"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:529
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:533
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:679
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:684
 msgid "OK"
 msgstr "Загружается"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:539
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:692
 msgid "Stalled"
 msgstr "Простаивает"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:541
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:695
 msgid "No Peers"
 msgstr "Нет Пиров"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:543
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:697
 msgid "Stopped"
 msgstr "Остановлен"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:556
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:712
 msgid "View files"
 msgstr "Открыть директорию"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:558
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:714
 msgid "Open file"
 msgstr "Открыть файл"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:794
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:744
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:961
 msgid "Tracker"
 msgstr "Трекер"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:745
 msgid "Details"
 msgstr "Подробнее"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:779
 msgid "Stop the torrent"
 msgstr "Остановить торрент"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:619
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:781
 msgid "Stop"
 msgstr "Остановить"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:625
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:787
 msgid "Start the torrent"
 msgstr "Запустить торрент"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:627
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:789
 msgid "Start"
 msgstr "Запустить"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:632
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:794
 msgid "Remove the torrent from the active list, deleting the .torrent file"
 msgstr "Удалить торрент из списка и с диска"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:637
+#. Can't figure out how to escape double quotes inside the onclick string.
+#. Single quotes in translate strings with parameters must be doubled.
+#. Then the remaining single quite must be escaped
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:799
 #, java-format
 msgid "Are you sure you want to delete the file \\''{0}.torrent\\'' (downloaded data will not be deleted) ?"
 msgstr "Вы действительно хотите удалить \\''{0}.torrent\\''? (загруженные файлы удаляться НЕ будут)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:639
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:801
 msgid "Remove"
 msgstr "Удалить"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:643
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:805
 msgid "Delete the .torrent file and the associated data file(s)"
 msgstr "Удалить торрент и стереть загруженные файлы"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:648
+#. Can't figure out how to escape double quotes inside the onclick string.
+#. Single quotes in translate strings with parameters must be doubled.
+#. Then the remaining single quite must be escaped
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:810
 #, java-format
 msgid "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded data?"
 msgstr "Вы действительно хотите удалить торрент \\''{0}\\'' и все загруженные файлы?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:650
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:812
 msgid "Delete"
 msgstr "Стереть"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:693
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:855
 msgid "Seed"
 msgstr "Сид"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:711
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:873
 msgid "Uninteresting (The peer has no pieces we need)"
 msgstr "Uninteresting (У пира нет нужных нам частей торрента)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:713
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:875
 msgid "Choked (The peer is not allowing us to request pieces)"
 msgstr "Choked (Этот пир не позволяет нам запрашивать части торрента)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:727
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:889
 msgid "Uninterested (We have no pieces the peer needs)"
 msgstr "Uninterested (У нас нужных этому пиру частей торрента)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:729
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:891
 msgid "Choking (We are not allowing the peer to request pieces)"
 msgstr "Choking (Мы не позволяем этому пиру запрашивать у нас части торрента)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:756
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:921
 msgid "Add Torrent"
 msgstr "Добавить Торрент"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:758
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:923
 msgid "From URL"
 msgstr "Из URL"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:763
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:928
 msgid "Add torrent"
 msgstr "Добавить торрент"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:766
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:931
 #, java-format
 msgid "Alternately, you can copy .torrent files to the directory {0}."
 msgstr "Ну или вы можете скопировать .torrent-файлы в директорию {0}."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:768
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:933
 msgid "Removing a .torrent file will cause the torrent to stop."
 msgstr "Удаление .torrent-файла приведет к остановке торрента."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:785
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:952
 msgid "Create Torrent"
 msgstr "Создать Торрент"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:788
+#. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\" value=\"" + newFile + "\" /><br>\n");
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:955
 msgid "Data to seed"
 msgstr "Файлы для раздачи"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:792
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:959
 msgid "File or directory to seed (must be within the specified path)"
 msgstr "Файл или директория для раздачи (вводите только название файла или директории, указание абсолютных путей не поддерживается)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:796
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:963
 msgid "Select a tracker"
 msgstr "Выбрать трекер"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:809
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:976
 msgid "or"
 msgstr "или"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:812
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:979
 msgid "Specify custom tracker announce URL"
 msgstr "Задать URL анонсера вручную"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:815
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:982
 msgid "Create torrent"
 msgstr "Создать торрент"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1000
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1127
 msgid "Configuration"
 msgstr "Настройки"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:836
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1003
 msgid "Data directory"
 msgstr "Директория для файлов"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:839
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1006
 msgid "Directory to store torrents and data"
 msgstr "Директория, где будут храниться торренты и загружаемые файлы"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:841
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1008
 msgid "Edit i2psnark.config and restart to change"
 msgstr "Для изменения отредактируйте файл i2psnark.config и перезагрузите I2PSnark"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:845
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1012
 msgid "Auto start"
 msgstr "Автозапуск"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:849
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1016
 msgid "If checked, automatically start torrents that are added"
 msgstr "Автоматически запускать торренты после добавления"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:872
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1020
+msgid "Startup delay"
+msgstr "Задержка запуска"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022
+msgid "minutes"
+msgstr "минут"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1046
 msgid "Total uploader limit"
 msgstr "Ограничение количества слотов отдачи"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:879
+# TODO should replace "uploader limit NN peers" with "global number of upload slots: NN"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049
+msgid "peers"
+msgstr "пир."
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1053
 msgid "Up bandwidth limit"
 msgstr "Ограничение скорости отдачи"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:882
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1056
 msgid "Half available bandwidth recommended."
 msgstr "Рекомендуется использовать половину от доступной пропускной способности."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:884
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1058
 msgid "View or change router bandwidth"
 msgstr "Посмотреть/настроить ограничения скорости в маршрутизаторе I2P"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:888
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1062
 msgid "Use open trackers also"
 msgstr "Дополнительно использовать открытые трекеры"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:892
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1066
 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:896
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1070
 msgid "Open tracker announce URLs"
 msgstr "URL открытых трекеров"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:907
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1082
+msgid "Inbound Settings"
+msgstr "Входящие туннели"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1088
+msgid "Outbound Settings"
+msgstr "Исходящие туннели"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1095
 msgid "I2CP host"
 msgstr "Адрес I2CP"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:912
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1100
 msgid "I2CP port"
 msgstr "Порт I2CP"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:925
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1112
 msgid "I2CP options"
 msgstr "Параметры I2CP"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:930
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1118
 msgid "Save configuration"
 msgstr "Сохранить настройки"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:983
+#. * dummies for translation
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1135
+#, java-format
+msgid "1 hop"
+msgid_plural "{0} hops"
+msgstr[0] "{0} хоп"
+msgstr[1] "{0} хопа"
+msgstr[2] "{0} хопов"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1136
+#, java-format
+msgid "1 tunnel"
+msgid_plural "{0} tunnels"
+msgstr[0] "{0} туннель"
+msgstr[1] "{0} туннеля"
+msgstr[2] "{0} туннелей"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1277
+msgid "Up to higher level directory"
+msgstr "Перейти в директорию уровнем выше"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1282
+msgid "File"
+msgstr "Файл"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1282
+msgid "Size"
+msgstr "Размер"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1305
+msgid "Directory"
+msgstr "Директория"
+
+# This debug error message intentionally left in English
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1310
+msgid "Torrent not found?"
+msgstr "Torrent not found?"
+
+# This debug error message intentionally left in English
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1318
+msgid "File not found in torrent?"
+msgstr "File not found in torrent?"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1324
+msgid "complete"
+msgstr "скачано"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1325
+msgid "bytes remaining"
+msgstr "байт осталось"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1450
 #, java-format
 msgid "Torrent fetched from {0}"
 msgstr "Получен торрент из: {0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1011
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1478
 #, java-format
 msgid "Torrent at {0} was not valid"
 msgstr "Торрент полученный из {0} некорректен"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1016
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1483
 #, java-format
 msgid "Torrent was not retrieved from {0}"
 msgstr "Не удалось получить торрент из: {0}"

apps/i2psnark/locale/messages_zh.po

@@ -8,663 +8,758 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P i2psnark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-05 12:41+0000\n"
-"PO-Revision-Date: 2010-03-05 21:58+0800\n"
+"POT-Creation-Date: 2010-07-01 04:52+0000\n"
+"PO-Revision-Date: 2010-07-01 12:53+0800\n"
 "Last-Translator: walking <walking@mail.i2p>\n"
 "Language-Team: foo <foo@bar>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Chinese\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:84
+#: ../java/src/org/klomp/snark/SnarkManager.java:88
 #, java-format
 msgid "Adding torrents in {0} minutes"
 msgstr "{0}分钟内完成添加"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:242
+#: ../java/src/org/klomp/snark/SnarkManager.java:258
 #, java-format
 msgid "Total uploaders limit changed to {0}"
-msgstr ""
+msgstr "总上传种子数限制已更新为{0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:244
+#: ../java/src/org/klomp/snark/SnarkManager.java:260
 #, java-format
 msgid "Minimum total uploaders limit is {0}"
-msgstr ""
+msgstr "最低上传种子数限制为{0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:256
+#: ../java/src/org/klomp/snark/SnarkManager.java:272
 #, java-format
 msgid "Up BW limit changed to {0}KBps"
 msgstr "上传带宽限制改为 {0} KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:258
+#: ../java/src/org/klomp/snark/SnarkManager.java:274
 #, java-format
 msgid "Minimum up bandwidth limit is {0}KBps"
 msgstr "最小上传带宽限制为 {0} KBps"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:302
-msgid "Cannot change the I2CP settings while torrents are active"
-msgstr "正在下载/上传，无法更改I2CP设置"
+#: ../java/src/org/klomp/snark/SnarkManager.java:286
+#, java-format
+msgid "Startup delay limit changed to {0} minutes"
+msgstr "启动延迟已更新为{0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:308
+#: ../java/src/org/klomp/snark/SnarkManager.java:333
+msgid "I2CP and tunnel changes will take effect after stopping all torrents"
+msgstr "I2CP与隧道设置的变化在所有种子停止后才能生效"
+
+#: ../java/src/org/klomp/snark/SnarkManager.java:339
 msgid "Disconnecting old I2CP destination"
 msgstr "正在断开旧的I2CP目标"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:312
+#: ../java/src/org/klomp/snark/SnarkManager.java:343
 #, java-format
 msgid "I2CP settings changed to {0}"
 msgstr "I2CP设置改为{0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:316
+#: ../java/src/org/klomp/snark/SnarkManager.java:347
 msgid "Unable to connect with the new settings, reverting to the old I2CP settings"
 msgstr "无法通过新设置连接，恢复I2CP的旧设置"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:320
+#: ../java/src/org/klomp/snark/SnarkManager.java:351
 msgid "Unable to reconnect with the old settings!"
 msgstr "旧设置也无法连接！"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:322
+#: ../java/src/org/klomp/snark/SnarkManager.java:353
 msgid "Reconnected on the new I2CP destination"
 msgstr "重新连接新I2CP目标"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:333
+#: ../java/src/org/klomp/snark/SnarkManager.java:364
 #, java-format
 msgid "I2CP listener restarted for \"{0}\""
 msgstr "\"{0}\"的I2CP监听端口已启动"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:344
+#: ../java/src/org/klomp/snark/SnarkManager.java:375
 msgid "Enabled autostart"
 msgstr "启用自动启动"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:346
+#: ../java/src/org/klomp/snark/SnarkManager.java:377
 msgid "Disabled autostart"
 msgstr "禁用自动启动"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:352
+#: ../java/src/org/klomp/snark/SnarkManager.java:383
 msgid "Enabled open trackers - torrent restart required to take effect."
 msgstr "启用OpenTracker-重新启动种子后生效"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:354
+#: ../java/src/org/klomp/snark/SnarkManager.java:385
 msgid "Disabled open trackers - torrent restart required to take effect."
 msgstr "禁用OpenTracker - 重新启动种子后生效"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:361
+#: ../java/src/org/klomp/snark/SnarkManager.java:392
 msgid "Open Tracker list changed - torrent restart required to take effect."
 msgstr "OpenTracker列表已改变 - 重新启动种子后生效"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:368
+#: ../java/src/org/klomp/snark/SnarkManager.java:399
 msgid "Configuration unchanged."
 msgstr "设置未改变"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:378
+#: ../java/src/org/klomp/snark/SnarkManager.java:409
 #, java-format
 msgid "Unable to save the config to {0}"
 msgstr "无法保存设置到{0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:396
+#: ../java/src/org/klomp/snark/SnarkManager.java:445
 msgid "Connecting to I2P"
 msgstr "正在连接到I2P"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:399
+#: ../java/src/org/klomp/snark/SnarkManager.java:448
 msgid "Error connecting to I2P - check your I2CP settings!"
 msgstr "连接I2P时发生错误 - 请检查I2CP设置!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:408
+#: ../java/src/org/klomp/snark/SnarkManager.java:457
 #, java-format
 msgid "Error: Could not add the torrent {0}"
 msgstr "错误：无法添加种子{0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:430
+#. catch this here so we don't try do delete it below
+#: ../java/src/org/klomp/snark/SnarkManager.java:479
 #, java-format
 msgid "Cannot open \"{0}\""
 msgstr "无法打开 \"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:443
+#: ../java/src/org/klomp/snark/SnarkManager.java:492
 #, java-format
 msgid "Warning - Ignoring non-i2p tracker in \"{0}\", will announce to i2p open trackers only"
 msgstr "警告 - 忽略\"{0}\"文件中I2P网络外的Tracker服务器，文件将仅发布至 I2P 内的 Open Tracker 服务器。"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:445
+#: ../java/src/org/klomp/snark/SnarkManager.java:494
 #, java-format
 msgid "Warning - Ignoring non-i2p tracker in \"{0}\", and open trackers are disabled, you must enable open trackers before starting the torrent!"
 msgstr "警告 - 忽略\"{0}\"文件中I2P网络外的Tracker服务器，OpenTracker已禁用，启动此种子前您必须启用OpenTracker。"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:464
+#: ../java/src/org/klomp/snark/SnarkManager.java:513
 #, java-format
 msgid "Torrent in \"{0}\" is invalid"
 msgstr "无效种子 \"{0}\" "
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:479
+#: ../java/src/org/klomp/snark/SnarkManager.java:528
 #, java-format
 msgid "Torrent added and started: \"{0}\""
 msgstr "已添加并启动种子:\"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:481
+#: ../java/src/org/klomp/snark/SnarkManager.java:530
 #, java-format
 msgid "Torrent added: \"{0}\""
 msgstr "已添加种子:\"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:578
+#: ../java/src/org/klomp/snark/SnarkManager.java:627
 #, java-format
 msgid "Too many files in \"{0}\" ({1}), deleting it!"
 msgstr "\"{0}\" ({1}) 含有太多文件，删除之!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:580
+#: ../java/src/org/klomp/snark/SnarkManager.java:629
 #, java-format
 msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
 msgstr "种子文件 \"{0}\" 不以 \".torrent\"结尾，正在删除！"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:582
+#: ../java/src/org/klomp/snark/SnarkManager.java:631
 #, java-format
 msgid "No pieces in \"{0}\",  deleting it!"
 msgstr "\"{0}\" 中没有数据片，删除之!"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:584
+#: ../java/src/org/klomp/snark/SnarkManager.java:633
 #, java-format
 msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
 msgstr "\"{0}\" 中文件分片太多，限额为{1}，删除之！"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:586
+#: ../java/src/org/klomp/snark/SnarkManager.java:635
 #, java-format
 msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
 msgstr "\"{0}\" ({1}B) 中文件分片过大，删除之。"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:587
+#: ../java/src/org/klomp/snark/SnarkManager.java:636
 #, java-format
 msgid "Limit is {0}B"
 msgstr "限额为 {0}B"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:595
+#: ../java/src/org/klomp/snark/SnarkManager.java:644
 #, java-format
 msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
 msgstr "目前不支持大于{0}B 的种子，正在删除\"{1}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:611
+#: ../java/src/org/klomp/snark/SnarkManager.java:660
 #, java-format
 msgid "Error: Could not remove the torrent {0}"
 msgstr "错误:无法删除种子{0}"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:632
+#: ../java/src/org/klomp/snark/SnarkManager.java:681
 #, java-format
 msgid "Torrent stopped: \"{0}\""
 msgstr "种子已停止:\"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:647
+#: ../java/src/org/klomp/snark/SnarkManager.java:696
 #, java-format
 msgid "Torrent removed: \"{0}\""
 msgstr "种子已删除:\"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:680
+#: ../java/src/org/klomp/snark/SnarkManager.java:729
 #, java-format
 msgid "Download finished: \"{0}\""
 msgstr "下载已完成:\"{0}\""
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:680
+#: ../java/src/org/klomp/snark/SnarkManager.java:729
 #, java-format
 msgid "size: {0}B"
 msgstr "大小:{0}B"
 
-#: ../java/src/org/klomp/snark/SnarkManager.java:708
+#: ../java/src/org/klomp/snark/SnarkManager.java:757
 msgid "Unable to connect to I2P!"
 msgstr "无法连接至I2P!"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:86
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:174
 msgid "I2PSnark - Anonymous BitTorrent Client"
 msgstr "I2PSnark - 匿名BitTorrent客户端"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:95
-msgid "Refresh page"
-msgstr "刷新页面"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:185
+msgid "Torrents"
+msgstr "种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:97
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:669
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:187
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:193
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:837
 msgid "I2PSnark"
 msgstr ""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:99
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:191
+msgid "Refresh page"
+msgstr "刷新页面"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:195
 msgid "Forum"
 msgstr "论坛"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:125
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:240
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1289
 msgid "Status"
 msgstr "状态"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:131
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:246
 msgid "Hide Peers"
 msgstr "隐藏用户"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:134
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:249
 msgid "Show Peers"
 msgstr "显示用户"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:139
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:254
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271
 msgid "Torrent"
 msgstr "种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:141
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:256
 msgid "ETA"
-msgstr ""
+msgstr "预计剩余时间"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:143
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:258
 msgid "Downloaded"
 msgstr "已下载"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:145
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:260
 msgid "Uploaded"
 msgstr "已上传"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:147
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:262
 msgid "Down Rate"
 msgstr "下载速度"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:149
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:264
 msgid "Up Rate"
 msgstr "上传速度"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:156
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:271
 msgid "Stop all torrents and the I2P tunnel"
 msgstr "停止全部种子及I2P隧道"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:158
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273
 msgid "Stop All"
 msgstr "停止全部"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:163
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:278
 msgid "Start all torrents and the I2P tunnel"
 msgstr "启动全部种子及I2P隧道"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:165
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:280
 msgid "Start All"
 msgstr "启动全部"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:182
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:297
 msgid "No torrents loaded."
 msgstr "未载入任何种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:187
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:302
 msgid "Totals"
 msgstr "总计"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:189
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:304
 #, java-format
-msgid "{0} torrents"
-msgstr "{0} 个种子"
+msgid "1 torrent"
+msgid_plural "{0} torrents"
+msgstr[0] "{0}个种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:192
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:307
 #, java-format
-msgid "{0} connected peers"
-msgstr "{0} 已连接用户"
+msgid "1 connected peer"
+msgid_plural "{0} connected peers"
+msgstr[0] "{0}个已连接用户"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:227
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:336
 #, java-format
 msgid "Torrent file {0} does not exist"
 msgstr "种子文件{0}不存在"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:237
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1003
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:346
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1476
 #, java-format
 msgid "Torrent already running: {0}"
 msgstr "种子已启动:{0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:239
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1005
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:348
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1478
 #, java-format
 msgid "Torrent already in the queue: {0}"
 msgstr "种子排队中:{0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:243
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:352
 #, java-format
 msgid "Copying torrent to {0}"
 msgstr "正在复制种子到{0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:246
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:355
 #, java-format
 msgid "Unable to copy the torrent to {0}"
 msgstr "无法复制种子文件到{0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:246
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:355
 #, java-format
 msgid "from {0}"
 msgstr "来源{0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:254
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:363
 #, java-format
 msgid "Fetching {0}"
 msgstr "正在获取{0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:258
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:367
 msgid "Invalid URL - must start with http://"
 msgstr "无效链接 - 必须以http:// 开头"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:288
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:397
 #, java-format
 msgid "Starting up torrent {0}"
 msgstr "正在启动种子{0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:308
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:326
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:417
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:435
 #, java-format
 msgid "Torrent file deleted: {0}"
 msgstr "种子文件已删除:{0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:332
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:342
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:441
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451
 #, java-format
 msgid "Data file deleted: {0}"
 msgstr "数据文件已删除:{0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:334
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:344
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:443
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:453
 #, java-format
 msgid "Data file could not be deleted: {0}"
 msgstr "无法删除数据文件:{0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:353
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:462
 #, java-format
 msgid "Data dir deleted: {0}"
 msgstr "数据文件夹已删除:{0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:384
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:494
 msgid "Error creating torrent - you must select a tracker"
 msgstr "创建种子时发生错误 - 您必须选择一个Tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:399
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509
 #, java-format
 msgid "Torrent created for \"{0}\""
 msgstr "种子创建成功\"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:402
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512
 #, java-format
 msgid "Many I2P trackers require you to register new torrents before seeding - please do so before starting \"{0}\""
 msgstr "多数I2PTracker需要用户在做种前注册新种子 - 请在启动 \"{0}\"前到所使用的Tracker进行注册。"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:404
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:514
 #, java-format
 msgid "Error creating a torrent for \"{0}\""
 msgstr "创建种子时发生错误 \"{0}\""
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:407
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:517
 #, java-format
 msgid "Cannot create a torrent for the nonexistent data: {0}"
 msgstr "无法为不存在的数据文件创建种子:{0}"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:410
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:520
 msgid "Error creating torrent - you must enter a file or directory"
 msgstr "创建种子时发生错误 - 必须指定文件或文件夹"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:413
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:523
 msgid "Stopping all torrents and closing the I2P tunnel."
 msgstr "正在停用所有种子并关闭I2P隧道。"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:422
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:532
 msgid "I2P tunnel closed."
 msgstr "I2P隧道已关闭"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:425
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535
 msgid "Opening the I2P tunnel and starting all torrents."
 msgstr "正在打开I2P隧道并启动所有种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:505
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:683
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:657
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:851
 msgid "Unknown"
 msgstr "未知"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:516
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:660
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:665
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:670
 msgid "TrackerErr"
 msgstr "Tracker错误"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:522
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:524
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:531
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:533
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:539
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:875
-msgid "peers"
-msgstr "用户"
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:663
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:666
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:677
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:688
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:691
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:696
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:699
+#, java-format
+msgid "1 peer"
+msgid_plural "{0} peers"
+msgstr[0] "{0}个用户"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:520
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:524
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:674
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:679
 msgid "Seeding"
 msgstr "正做种"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:526
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:682
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1327
 msgid "Complete"
 msgstr "完成"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:529
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:533
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:685
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:690
 msgid "OK"
 msgstr "确定"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:539
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:693
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698
 msgid "Stalled"
 msgstr "等待"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:541
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:701
 msgid "No Peers"
 msgstr "没有用户"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:543
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:703
 msgid "Stopped"
 msgstr "已停用"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:556
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:718
 msgid "View files"
 msgstr "浏览文件"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:558
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:720
 msgid "Open file"
 msgstr "打开文件"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:794
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:750
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:967
 msgid "Tracker"
 msgstr "Tracker服务器"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:751
 msgid "Details"
 msgstr "详情"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:785
 msgid "Stop the torrent"
 msgstr "停止种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:619
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:787
 msgid "Stop"
 msgstr "停止"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:625
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:793
 msgid "Start the torrent"
 msgstr "启动种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:627
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:795
 msgid "Start"
 msgstr "启动"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:632
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:800
 msgid "Remove the torrent from the active list, deleting the .torrent file"
 msgstr "取消下载任务并删除对应种子文件。"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:637
+#. Can't figure out how to escape double quotes inside the onclick string.
+#. Single quotes in translate strings with parameters must be doubled.
+#. Then the remaining single quite must be escaped
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:805
 #, java-format
 msgid "Are you sure you want to delete the file \\''{0}.torrent\\'' (downloaded data will not be deleted) ?"
 msgstr "您确定要删除文件“{0}.torrent”(下载的数据文件不会被删除)?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:639
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:807
 msgid "Remove"
 msgstr "移除"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:643
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811
 msgid "Delete the .torrent file and the associated data file(s)"
 msgstr "删除种子及所下载的文件"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:648
+#. Can't figure out how to escape double quotes inside the onclick string.
+#. Single quotes in translate strings with parameters must be doubled.
+#. Then the remaining single quite must be escaped
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:816
 #, java-format
 msgid "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded data?"
 msgstr "您确定要删除种子“{0}”(下载的数据文件会一并被删除)?"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:650
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:818
 msgid "Delete"
 msgstr "删除"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:693
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:861
 msgid "Seed"
 msgstr "种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:711
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:879
 msgid "Uninteresting (The peer has no pieces we need)"
 msgstr "无需要部分"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:713
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:881
 msgid "Choked (The peer is not allowing us to request pieces)"
 msgstr "拒绝请求"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:727
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:895
 msgid "Uninterested (We have no pieces the peer needs)"
 msgstr "无需要部分"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:729
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:897
 msgid "Choking (We are not allowing the peer to request pieces)"
 msgstr "拒绝请求"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:756
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:927
 msgid "Add Torrent"
 msgstr "添加种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:758
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:929
 msgid "From URL"
 msgstr "从URL"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:763
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:934
 msgid "Add torrent"
 msgstr "添加种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:766
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:937
 #, java-format
 msgid "Alternately, you can copy .torrent files to the directory {0}."
 msgstr "或者您可以将.torrent文件复制到以下目录{0}."
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:768
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:939
 msgid "Removing a .torrent file will cause the torrent to stop."
 msgstr "删除种子文件将导致中止该下载任务。"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:785
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958
 msgid "Create Torrent"
 msgstr "创建种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:788
+#. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\" value=\"" + newFile + "\" /><br>\n");
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:961
 msgid "Data to seed"
 msgstr "做种数据"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:792
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:965
 msgid "File or directory to seed (must be within the specified path)"
 msgstr "做种文件或文件夹(必须下面为Snark指定的文件夹中)"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:796
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:969
 msgid "Select a tracker"
 msgstr "选择一个Tracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:809
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:982
 msgid "or"
 msgstr "或"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:812
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985
 msgid "Specify custom tracker announce URL"
 msgstr "指定Open Tracker发布链接"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:815
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:988
 msgid "Create torrent"
 msgstr "创建种子"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1006
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1133
 msgid "Configuration"
 msgstr "设置"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:836
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1009
 msgid "Data directory"
 msgstr "数据文件夹"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:839
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1012
 msgid "Directory to store torrents and data"
 msgstr "种子及被做种文件的保存位置。"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:841
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014
 msgid "Edit i2psnark.config and restart to change"
 msgstr "编辑 i2psnark.config 并重启Snark后生效"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:845
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1018
 msgid "Auto start"
 msgstr "自动启动"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:849
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022
 msgid "If checked, automatically start torrents that are added"
 msgstr "选中后Snark将自动启动已添加的所有种子。"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:872
-msgid "Total uploader limit"
-msgstr ""
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1026
+msgid "Startup delay"
+msgstr "启动延迟"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:879
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1028
+msgid "minutes"
+msgstr "分"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1052
+msgid "Total uploader limit"
+msgstr "限制总上传种子数为"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055
+msgid "peers"
+msgstr "用户"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1059
 msgid "Up bandwidth limit"
 msgstr "上传带宽限制"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:882
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1062
 msgid "Half available bandwidth recommended."
 msgstr "推荐设置为可用带宽的一半。"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:884
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1064
 msgid "View or change router bandwidth"
 msgstr "浏览或修改路由器带宽"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:888
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068
 msgid "Use open trackers also"
 msgstr "同时使用OpenTracker"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:892
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1072
 msgid "If checked, announce torrents to open trackers as well as the tracker listed in the torrent file"
 msgstr "选择后在OpenTracker及种子文件中的Tracker上同时发布。"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:896
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1076
 msgid "Open tracker announce URLs"
 msgstr "Open Tracker发布链接"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:907
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1088
+msgid "Inbound Settings"
+msgstr "入站设置"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
+msgid "Outbound Settings"
+msgstr "出站设置"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1101
 msgid "I2CP host"
 msgstr "I2CP主机"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:912
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1106
 msgid "I2CP port"
 msgstr "I2CP端口"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:925
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1118
 msgid "I2CP options"
 msgstr "I2CP选项"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:930
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1124
 msgid "Save configuration"
 msgstr "保存设置"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:983
+#. * dummies for translation
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1141
+#, java-format
+msgid "1 hop"
+msgid_plural "{0} hops"
+msgstr[0] "{0}跳"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142
+#, java-format
+msgid "1 tunnel"
+msgid_plural "{0} tunnels"
+msgstr[0] "{0}隧道"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1283
+msgid "Up to higher level directory"
+msgstr "上一层文件夹"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
+msgid "File"
+msgstr "文件"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288
+msgid "Size"
+msgstr "大小"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1311
+msgid "Directory"
+msgstr "文件夹"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1316
+msgid "Torrent not found?"
+msgstr "种子未找到"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1324
+msgid "File not found in torrent?"
+msgstr "种子中没有发现文件？"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1330
+msgid "complete"
+msgstr "完成"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1331
+msgid "bytes remaining"
+msgstr "剩余字节数"
+
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1456
 #, java-format
 msgid "Torrent fetched from {0}"
 msgstr "从{0}获取种子成功"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1011
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1484
 #, java-format
 msgid "Torrent at {0} was not valid"
 msgstr "{0}的种子中有错误"
 
-#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1016
+#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489
 #, java-format
 msgid "Torrent was not retrieved from {0}"
 msgstr "从{0}获得种子失败"
 
+#~ msgid "Cannot change the I2CP settings while torrents are active"
+#~ msgstr "正在下载/上传，无法更改I2CP设置"
+#~ msgid "{0} torrents"
+#~ msgstr "{0} 个种子"
 #~ msgid "Non-i2p tracker in \"{0}\", deleting it from our list of trackers!"
 #~ msgstr ""
 #~ "【匿名性警告】\"{0}\" 中含有非I2P Tracker，程序将从Tracker列表中将其删除。"

apps/i2ptunnel/java/build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir="." default="all" name="i2ptunnel">
     <target name="all" depends="clean, build" />
-    <target name="build" depends="builddep, jar" />
+    <target name="build" depends="builddep, jar, war" />
     <target name="builddep">
         <ant dir="../../ministreaming/java/" target="build" />
         <ant dir="../../jetty/" target="build" />
@@ -34,6 +34,10 @@
             <compilerarg line="${javac.compilerargs}" />
         </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">
         <jar destfile="./build/i2ptunnel.jar" basedir="./build/obj" includes="**/*.class">
             <manifest>
@@ -41,8 +45,6 @@
                 <attribute name="Class-Path" value="i2p.jar mstreaming.jar" />
             </manifest>
         </jar>
-        <ant target="bundle" />
-        <ant target="war" />
     </target>
 
     <target name="bundle" depends="compile, precompilejsp">
@@ -77,13 +79,13 @@
         </exec>
     </target>
 
-    <target name="war" depends="precompilejsp"> 
+    <target name="war" depends="precompilejsp, bundle"> 
         <war destfile="build/i2ptunnel.war" webxml="../jsp/web-out.xml"
              basedir="../jsp/" excludes="web.xml, **/*.java, *.jsp">
         </war>
     </target>
 
-    <target name="precompilejsp" unless="precompilejsp.uptodate">
+    <target name="precompilejsp" depends="jar" unless="precompilejsp.uptodate">
         <delete dir="../jsp/WEB-INF/" />
         <delete file="../jsp/web-fragment.xml" />
         <delete file="../jsp/web-out.xml" />

apps/i2ptunnel/java/bundle-messages.sh

@@ -51,7 +51,7 @@ do
 		# To start a new translation, copy the header from an old translation to the new .po file,
 		# then ant distclean updater.
 		find $JPATHS -name *.java > $TMPFILE
-		xgettext -f $TMPFILE -F -L java --from-code=UTF-8 \
+		xgettext -f $TMPFILE -F -L java --from-code=UTF-8 --add-comments\
 	                 --keyword=_ --keyword=_x --keyword=intl._ --keyword=intl.title \
 		         -o ${i}t
 		if [ $? -ne 0 ]

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

@@ -124,13 +124,13 @@ class HTTPResponseOutputStream extends FilterOutputStream {
      * Tweak that first HTTP response line (HTTP 200 OK, etc)
      *
      */
-    protected String filterResponseLine(String line) {
+    protected static String filterResponseLine(String line) {
         return line;
     }
     
     /** we ignore any potential \r, since we trim it on write anyway */
     private static final byte NL = '\n';
-    private boolean isNL(byte b) { return (b == NL); }
+    private static boolean isNL(byte b) { return (b == NL); }
     
     /** ok, received, now munge & write it */
     private void writeHeader() throws IOException {
@@ -275,7 +275,8 @@ class HTTPResponseOutputStream extends FilterOutputStream {
             _context.statManager().addRateData("i2ptunnel.httpExpanded", (long)expanded, end-start);
         }
     }
-    private class InternalGZIPInputStream extends GZIPInputStream {
+
+    private static class InternalGZIPInputStream extends GZIPInputStream {
         public InternalGZIPInputStream(InputStream in) throws IOException {
             super(in);
         }
@@ -318,6 +319,7 @@ class HTTPResponseOutputStream extends FilterOutputStream {
         return super.toString() + ": " + _in;
     }
     
+/*******
     public static void main(String args[]) {
         String simple   = "HTTP/1.1 200 OK\n" +
                           "foo: bar\n" +
@@ -367,7 +369,6 @@ class HTTPResponseOutputStream extends FilterOutputStream {
                           "A:\n" +
                           "\n";
         
-        /* */
         test("Simple", simple, true);
         test("Filtered", filtered, true);
         test("Filtered windows", winfilter, true);
@@ -382,7 +383,6 @@ class HTTPResponseOutputStream extends FilterOutputStream {
         test("Invalid (bad headers)", invalid5, true);
         test("Invalid (bad headers2)", invalid6, false);
         test("Invalid (bad headers3)", invalid7, false);
-        /* */
     }
     
     private static void test(String name, String orig, boolean shouldPass) {
@@ -401,4 +401,5 @@ class HTTPResponseOutputStream extends FilterOutputStream {
                 System.out.println("Properly fails with " + e.getMessage());
         }
     }
+******/
 }

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

@@ -69,6 +69,9 @@ import net.i2p.util.EventDispatcher;
 import net.i2p.util.EventDispatcherImpl;
 import net.i2p.util.Log;
 
+/**
+ *  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;
@@ -163,7 +166,12 @@ public class I2PTunnel implements Logging, EventDispatcher {
                     System.out.print("I2PTunnel>");
                     String cmd = r.readLine();
                     if (cmd == null) break;
-                    runCommand(cmd, this);
+                    if (cmd.length() <= 0) continue;
+                    try {
+                        runCommand(cmd, this);
+                    } catch (Throwable t) {
+                        t.printStackTrace();
+                    }
                 }
             } catch (IOException ex) {
                 ex.printStackTrace();
@@ -180,6 +188,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
         }
     }
 
+    /** @return non-null */
     List<I2PSession> getSessions() { 
         synchronized (_sessions) {
             return new ArrayList(_sessions); 
@@ -351,6 +360,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
      *
      * @param args {hostname, portNumber, privKeyFilename}
      * @param l logger to receive events and output
+     * @throws IllegalArgumentException on config problem
      */
     public void runServer(String args[], Logging l) {
         if (args.length == 3) {
@@ -363,7 +373,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 l.log("unknown host");
                 _log.error(getPrefix() + "Error resolving " + args[0], uhe);
                 notifyEvent("serverTaskId", Integer.valueOf(-1));
-                return;
+                throw new IllegalArgumentException(getPrefix() + "Error resolving " + args[0] + uhe.getMessage());
             }
 
             try {
@@ -372,17 +382,18 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 l.log("invalid port");
                 _log.error(getPrefix() + "Port specified is not valid: " + args[1], nfe);
                 notifyEvent("serverTaskId", Integer.valueOf(-1));
-                return;
             }
+            if (portNum <= 0)
+                throw new IllegalArgumentException(getPrefix() + "Bad port " + args[1]);
 
             privKeyFile = new File(args[2]);
             if (!privKeyFile.isAbsolute())
                 privKeyFile = new File(_context.getConfigDir(), args[2]);
             if (!privKeyFile.canRead()) {
-                l.log("private key file does not exist");
+                l.log(getPrefix() + "Private key file does not exist or is not readable: " + args[2]);
                 _log.error(getPrefix() + "Private key file does not exist or is not readable: " + args[2]);
                 notifyEvent("serverTaskId", Integer.valueOf(-1));
-                return;
+                throw new IllegalArgumentException(getPrefix() + "Cannot open private key file " + args[2]);
             }
             I2PTunnelServer serv = new I2PTunnelServer(serverHost, portNum, privKeyFile, args[2], l, (EventDispatcher) this, this);
             serv.setReadTimeout(readTimeout);
@@ -400,6 +411,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
     /**
      * Same args as runServer
      * (we should stop duplicating all this code...)
+     * @throws IllegalArgumentException on config problem
      */
     public void runIrcServer(String args[], Logging l) {
         if (args.length == 3) {
@@ -412,7 +424,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 l.log("unknown host");
                 _log.error(getPrefix() + "Error resolving " + args[0], uhe);
                 notifyEvent("serverTaskId", Integer.valueOf(-1));
-                return;
+                throw new IllegalArgumentException(getPrefix() + "Error resolving " + args[0] + uhe.getMessage());
             }
 
             try {
@@ -421,17 +433,18 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 l.log("invalid port");
                 _log.error(getPrefix() + "Port specified is not valid: " + args[1], nfe);
                 notifyEvent("serverTaskId", Integer.valueOf(-1));
-                return;
             }
+            if (portNum <= 0)
+                throw new IllegalArgumentException(getPrefix() + "Bad port " + args[1]);
 
             privKeyFile = new File(args[2]);
             if (!privKeyFile.isAbsolute())
                 privKeyFile = new File(_context.getConfigDir(), args[2]);
             if (!privKeyFile.canRead()) {
-                l.log("private key file does not exist");
+                l.log(getPrefix() + "Private key file does not exist or is not readable: " + args[2]);
                 _log.error(getPrefix() + "Private key file does not exist or is not readable: " + args[2]);
                 notifyEvent("serverTaskId", Integer.valueOf(-1));
-                return;
+                throw new IllegalArgumentException(getPrefix() + "Cannot open private key file " + args[2]);
             }
             I2PTunnelServer serv = new I2PTunnelIRCServer(serverHost, portNum, privKeyFile, args[2], l, (EventDispatcher) this, this);
             serv.setReadTimeout(readTimeout);
@@ -457,6 +470,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
      *
      * @param args {hostname, portNumber, spoofedHost, privKeyFilename}
      * @param l logger to receive events and output
+     * @throws IllegalArgumentException on config problem
      */
     public void runHttpServer(String args[], Logging l) {
         if (args.length == 4) {
@@ -469,7 +483,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 l.log("unknown host");
                 _log.error(getPrefix() + "Error resolving " + args[0], uhe);
                 notifyEvent("serverTaskId", Integer.valueOf(-1));
-                return;
+                throw new IllegalArgumentException(getPrefix() + "Error resolving " + args[0] + uhe.getMessage());
             }
 
             try {
@@ -478,8 +492,9 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 l.log("invalid port");
                 _log.error(getPrefix() + "Port specified is not valid: " + args[1], nfe);
                 notifyEvent("serverTaskId", Integer.valueOf(-1));
-                return;
             }
+            if (portNum <= 0)
+                throw new IllegalArgumentException(getPrefix() + "Bad port " + args[1]);
 
             String spoofedHost = args[2];
             
@@ -487,10 +502,10 @@ public class I2PTunnel implements Logging, EventDispatcher {
             if (!privKeyFile.isAbsolute())
                 privKeyFile = new File(_context.getConfigDir(), args[3]);
             if (!privKeyFile.canRead()) {
-                l.log("private key file does not exist");
+                l.log(getPrefix() + "Private key file does not exist or is not readable: " + args[3]);
                 _log.error(getPrefix() + "Private key file does not exist or is not readable: " + args[3]);
                 notifyEvent("serverTaskId", Integer.valueOf(-1));
-                return;
+                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);
             serv.setReadTimeout(readTimeout);
@@ -519,6 +534,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
      *
      * @param args {hostname, portNumber, proxyPortNumber, spoofedHost, privKeyFilename}
      * @param l logger to receive events and output
+     * @throws IllegalArgumentException on config problem
      */
     public void runHttpBidirServer(String args[], Logging l) {
         if (args.length == 5) {
@@ -532,7 +548,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 l.log("unknown host");
                 _log.error(getPrefix() + "Error resolving " + args[0], uhe);
                 notifyEvent("serverTaskId", Integer.valueOf(-1));
-                return;
+                throw new IllegalArgumentException(getPrefix() + "Error resolving " + args[0] + uhe.getMessage());
             }
 
             try {
@@ -541,7 +557,6 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 l.log("invalid port");
                 _log.error(getPrefix() + "Port specified is not valid: " + args[1], nfe);
                 notifyEvent("serverTaskId", Integer.valueOf(-1));
-                return;
             }
 
             try {
@@ -550,8 +565,11 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 l.log("invalid port");
                 _log.error(getPrefix() + "Port specified is not valid: " + args[2], nfe);
                 notifyEvent("serverTaskId", Integer.valueOf(-1));
-                return;
             }
+            if (portNum <= 0)
+                throw new IllegalArgumentException(getPrefix() + "Bad port " + args[1]);
+            if (port2Num <= 0)
+                throw new IllegalArgumentException(getPrefix() + "Bad port " + args[2]);
 
             String spoofedHost = args[3];
 
@@ -559,10 +577,10 @@ public class I2PTunnel implements Logging, EventDispatcher {
             if (!privKeyFile.isAbsolute())
                 privKeyFile = new File(_context.getConfigDir(), args[4]);
             if (!privKeyFile.canRead()) {
-                l.log("private key file does not exist");
+                l.log(getPrefix() + "Private key file does not exist or is not readable: " + args[4]);
                 _log.error(getPrefix() + "Private key file does not exist or is not readable: " + args[4]);
                 notifyEvent("serverTaskId", Integer.valueOf(-1));
-                return;
+                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);
@@ -585,12 +603,16 @@ public class I2PTunnel implements Logging, EventDispatcher {
      * Run the server pointing at the host and port specified using the private i2p
      * destination loaded from the given base64 stream. <p />
      *
+     * Deprecated? Why run a server with a private destination?
+     * Not available from the war GUI
+     *
      * Sets the event "serverTaskId" = Integer(taskId) after the tunnel has been started (or -1 on error)
      * Also sets the event "openServerResult" = "ok" or "error" (displaying "Ready!" on the logger after
      * 'ok').  So, success = serverTaskId != -1 and openServerResult = ok.
      *
      * @param args {hostname, portNumber, privKeyBase64}
      * @param l logger to receive events and output
+     * @throws IllegalArgumentException on config problem
      */
     public void runTextServer(String args[], Logging l) {
         if (args.length == 3) {
@@ -602,7 +624,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 l.log("unknown host");
                 _log.error(getPrefix() + "Error resolving " + args[0], uhe);
                 notifyEvent("serverTaskId", Integer.valueOf(-1));
-                return;
+                throw new IllegalArgumentException(getPrefix() + "Error resolving " + args[0] + uhe.getMessage());
             }
 
             try {
@@ -611,8 +633,9 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 l.log("invalid port");
                 _log.error(getPrefix() + "Port specified is not valid: " + args[1], nfe);
                 notifyEvent("serverTaskId", Integer.valueOf(-1));
-                return;
             }
+            if (portNum <= 0)
+                throw new IllegalArgumentException(getPrefix() + "Bad port " + args[1]);
 
             I2PTunnelServer serv = new I2PTunnelServer(serverHost, portNum, args[2], l, (EventDispatcher) this, this);
             serv.setReadTimeout(readTimeout);
@@ -638,6 +661,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
      *
      * @param args {portNumber, destinationBase64 or "file:filename"[, sharedClient [, privKeyFile]]}
      * @param l logger to receive events and output
+     * @throws IllegalArgumentException on config problem
      */
     public void runClient(String args[], Logging l) {
         boolean isShared = true;
@@ -651,8 +675,10 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 l.log("invalid port");
                 _log.error(getPrefix() + "Port specified is not valid: " + args[0], nfe);
                 notifyEvent("clientTaskId", Integer.valueOf(-1));
-                return;
             }
+            if (portNum <= 0)
+                throw new IllegalArgumentException(getPrefix() + "Bad port " + args[0]);
+
             I2PTunnelTask task;
             ownDest = !isShared;
             try {
@@ -666,6 +692,11 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 _log.error(getPrefix() + "Invalid I2PTunnel config to create a client [" + host + ":"+ port + "]", iae);
                 l.log("Invalid I2PTunnel configuration [" + host + ":" + port + "]");
                 notifyEvent("clientTaskId", Integer.valueOf(-1));
+                // Since nothing listens to TaskID events, use this to propagate the error to TunnelController
+                // Otherwise, the tunnel stays up even though the port is down
+                // This doesn't work for CLI though... and the tunnel doesn't close itself after error,
+                // so this probably leaves the tunnel open if called from the CLI
+                throw iae;
             }
         } else {
             l.log("client <port> <pubkey>[,<pubkey>]|file:<pubkeyfile>[ <sharedClient>] [<privKeyFile>]");
@@ -687,6 +718,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
      *
      * @param args {portNumber[, sharedClient][, proxy to be used for the WWW]}
      * @param l logger to receive events and output
+     * @throws IllegalArgumentException on config problem
      */
     public void runHttpClient(String args[], Logging l) {
         if (args.length >= 1 && args.length <= 3) {
@@ -697,8 +729,9 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 l.log("invalid port");
                 _log.error(getPrefix() + "Port specified is not valid: " + args[0], nfe);
                 notifyEvent("httpclientTaskId", Integer.valueOf(-1));
-                return;
             }
+            if (clientPort <= 0)
+                throw new IllegalArgumentException(getPrefix() + "Bad port " + args[0]);
             
             String proxy = "";
             boolean isShared = true;
@@ -733,6 +766,11 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 _log.error(getPrefix() + "Invalid I2PTunnel config to create an httpclient [" + host + ":"+ clientPort + "]", iae);
                 l.log("Invalid I2PTunnel configuration [" + host + ":" + clientPort + "]");
                 notifyEvent("httpclientTaskId", Integer.valueOf(-1));
+                // Since nothing listens to TaskID events, use this to propagate the error to TunnelController
+                // Otherwise, the tunnel stays up even though the port is down
+                // This doesn't work for CLI though... and the tunnel doesn't close itself after error,
+                // so this probably leaves the tunnel open if called from the CLI
+                throw iae;
             }
         } else {
             l.log("httpclient <port> [<sharedClient>] [<proxy>]");
@@ -749,6 +787,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
      *
      * @param args {portNumber[, sharedClient][, proxy to be used for the WWW]}
      * @param l logger to receive events and output
+     * @throws IllegalArgumentException on config problem
      */
     public void runConnectClient(String args[], Logging l) {
         if (args.length >= 1 && args.length <= 3) {
@@ -757,8 +796,9 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 _port = Integer.parseInt(args[0]);
             } catch (NumberFormatException nfe) {
                 _log.error(getPrefix() + "Port specified is not valid: " + args[0], nfe);
-                return;
             }
+            if (_port <= 0)
+                throw new IllegalArgumentException(getPrefix() + "Bad port " + args[0]);
             
             String proxy = "";
             boolean isShared = true;
@@ -789,7 +829,12 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 task = new I2PTunnelConnectClient(_port, l, ownDest, proxy, (EventDispatcher) this, this);
                 addtask(task);
             } catch (IllegalArgumentException iae) {
-                _log.error(getPrefix() + "Invalid I2PTunnel config to create an httpclient [" + host + ":"+ _port + "]", iae);
+                _log.error(getPrefix() + "Invalid I2PTunnel config to create a connect client [" + host + ":"+ _port + "]", iae);
+                // Since nothing listens to TaskID events, use this to propagate the error to TunnelController
+                // Otherwise, the tunnel stays up even though the port is down
+                // This doesn't work for CLI though... and the tunnel doesn't close itself after error,
+                // so this probably leaves the tunnel open if called from the CLI
+                throw iae;
             }
         } else {
             l.log("connectclient <port> [<sharedClient>] [<proxy>]");
@@ -809,6 +854,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
      *
      * @param args {portNumber,destinationBase64 or "file:filename" [, sharedClient [, privKeyFile]]}
      * @param l logger to receive events and output
+     * @throws IllegalArgumentException on config problem
      */
     public void runIrcClient(String args[], Logging l) {
         if (args.length >= 2) {
@@ -819,8 +865,9 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 l.log("invalid port");
                 _log.error(getPrefix() + "Port specified is not valid: " + args[0], nfe);
                 notifyEvent("ircclientTaskId", Integer.valueOf(-1));
-                return;
             }
+            if (_port <= 0)
+                throw new IllegalArgumentException(getPrefix() + "Bad port " + args[0]);
             
             boolean isShared = true;
             if (args.length > 2) {
@@ -848,6 +895,11 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 _log.error(getPrefix() + "Invalid I2PTunnel config to create an ircclient [" + host + ":"+ _port + "]", iae);
                 l.log("Invalid I2PTunnel configuration [" + host + ":" + _port + "]");
                 notifyEvent("ircclientTaskId", Integer.valueOf(-1));
+                // Since nothing listens to TaskID events, use this to propagate the error to TunnelController
+                // Otherwise, the tunnel stays up even though the port is down
+                // This doesn't work for CLI though... and the tunnel doesn't close itself after error,
+                // so this probably leaves the tunnel open if called from the CLI
+                throw iae;
             }
         } else {
             l.log("ircclient <port> [<sharedClient> [<privKeyFile>]]");
@@ -867,6 +919,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
      *
      * @param args {portNumber [, sharedClient]}
      * @param l logger to receive events and output
+     * @throws IllegalArgumentException on config problem
      */
     public void runSOCKSTunnel(String args[], Logging l) {
         if (args.length >= 1 && args.length <= 2) {
@@ -877,8 +930,9 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 l.log("invalid port");
                 _log.error(getPrefix() + "Port specified is not valid: " + args[0], nfe);
                 notifyEvent("sockstunnelTaskId", Integer.valueOf(-1));
-                return;
             }
+            if (_port <= 0)
+                throw new IllegalArgumentException(getPrefix() + "Bad port " + args[0]);
 
             boolean isShared = false;
             if (args.length > 1)
@@ -886,7 +940,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
 
             ownDest = !isShared;
             I2PTunnelTask task;
-            task = new I2PSOCKSTunnel(_port, l, ownDest, (EventDispatcher) this, this);
+            task = new I2PSOCKSTunnel(_port, l, ownDest, (EventDispatcher) this, this, null);
             addtask(task);
             notifyEvent("sockstunnelTaskId", Integer.valueOf(task.getId()));
         } else {
@@ -899,10 +953,12 @@ public class I2PTunnel implements Logging, EventDispatcher {
     
     /**
      * Run an SOCKS IRC tunnel on the given port number 
+     * @param args {portNumber [, sharedClient]} or (portNumber, ignored (false), privKeyFile)
+     * @throws IllegalArgumentException on config problem
      * @since 0.7.12
      */
     public void runSOCKSIRCTunnel(String args[], Logging l) {
-        if (args.length >= 1 && args.length <= 2) {
+        if (args.length >= 1 && args.length <= 3) {
             int _port = -1;
             try {
                 _port = Integer.parseInt(args[0]);
@@ -910,21 +966,25 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 l.log("invalid port");
                 _log.error(getPrefix() + "Port specified is not valid: " + args[0], nfe);
                 notifyEvent("sockstunnelTaskId", Integer.valueOf(-1));
-                return;
             }
+            if (_port <= 0)
+                throw new IllegalArgumentException(getPrefix() + "Bad port " + args[0]);
 
             boolean isShared = false;
-            if (args.length > 1)
+            if (args.length == 2)
                 isShared = "true".equalsIgnoreCase(args[1].trim());
 
             ownDest = !isShared;
+            String privateKeyFile = null;
+            if (args.length == 3)
+                privateKeyFile = args[2];
             I2PTunnelTask task;
-            task = new I2PSOCKSIRCTunnel(_port, l, ownDest, (EventDispatcher) this, this);
+            task = new I2PSOCKSIRCTunnel(_port, l, ownDest, (EventDispatcher) this, this, privateKeyFile);
             addtask(task);
             notifyEvent("sockstunnelTaskId", Integer.valueOf(task.getId()));
         } else {
-            l.log("sockstunnel <port>");
-            l.log("  creates a tunnel that distributes SOCKS requests.");
+            l.log("socksirctunnel <port> [<sharedClient> [<privKeyFile>]]");
+            l.log("  creates a tunnel for SOCKS IRC.");
             notifyEvent("sockstunnelTaskId", Integer.valueOf(-1));
         }
     }
@@ -934,6 +994,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
      *
      * @param args {targethost, targetport, destinationString}
      * @param l logger to receive events and output
+     * @throws IllegalArgumentException on config problem
      */
     public void runStreamrClient(String args[], Logging l) {
         if (args.length == 3) {
@@ -954,8 +1015,9 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 l.log("invalid port");
                 _log.error(getPrefix() + "Port specified is not valid: " + args[0], nfe);
                 notifyEvent("streamrtunnelTaskId", Integer.valueOf(-1));
-                return;
             }
+            if (_port <= 0)
+                throw new IllegalArgumentException(getPrefix() + "Bad port " + args[0]);
 
             StreamrConsumer task = new StreamrConsumer(_host, _port, args[2], l, (EventDispatcher) this, this);
             task.startRunning();
@@ -973,6 +1035,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
      *
      * @param args {port, privkeyfile}
      * @param l logger to receive events and output
+     * @throws IllegalArgumentException on config problem
      */
     public void runStreamrServer(String args[], Logging l) {
         if (args.length == 2) {
@@ -983,8 +1046,9 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 l.log("invalid port");
                 _log.error(getPrefix() + "Port specified is not valid: " + args[0], nfe);
                 notifyEvent("streamrtunnelTaskId", Integer.valueOf(-1));
-                return;
             }
+            if (_port <= 0)
+                throw new IllegalArgumentException(getPrefix() + "Bad port " + args[0]);
 
             File privKeyFile = new File(args[1]);
             if (!privKeyFile.isAbsolute())
@@ -1525,7 +1589,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
         }
     }
     
-    private String getPrefix() { return '[' + _tunnelId + "]: "; }
+    private String getPrefix() { return "[" + _tunnelId + "]: "; }
     
     public I2PAppContext getContext() { return _context; }
 

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

@@ -20,7 +20,7 @@ public class I2PTunnelClient extends I2PTunnelClientBase {
     private static final Log _log = new Log(I2PTunnelClient.class);
 
     /** list of Destination objects that we point at */
-    protected List dests;
+    protected List<Destination> dests;
     private static final long DEFAULT_READ_TIMEOUT = 5*60*1000; // -1
     protected long readTimeout = DEFAULT_READ_TIMEOUT;
 
@@ -54,10 +54,21 @@ public class I2PTunnelClient extends I2PTunnelClientBase {
             }
         }
 
-        if (dests.size() <= 0) {
-            l.log("No target destinations found");
+        if (dests.isEmpty()) {
+            l.log("No valid target destinations found");
             notifyEvent("openClientResult", "error");
-            return;
+            // Nothing is listening for the above event, so it's useless
+            // Maybe figure out where to put a waitEventValue("openClientResult") ??
+            // In the meantime, let's do this the easy way
+            // Note that b32 dests will often not be resolvable at instantiation time;
+            // a delayed resolution system would be even better.
+
+            // Don't close() here, because it does a removeSession() and then
+            // TunnelController can't acquire() it to release() it.
+            //close(true);
+            // Unfortunately, super() built the whole tunnel before we get here.
+            throw new IllegalArgumentException("No valid target destinations found");
+            //return;
         }
 
         setName(getLocalPort() + " -> " + destinations);
@@ -78,8 +89,9 @@ public class I2PTunnelClient extends I2PTunnelClientBase {
             i2ps.setReadTimeout(readTimeout);
             new I2PTunnelRunner(s, i2ps, sockLock, null, mySockets);
         } catch (Exception ex) {
-            _log.info("Error connecting", ex);
-            l.log(ex.getMessage());
+            if (_log.shouldLog(Log.INFO))
+                _log.info("Error connecting", ex);
+            //l.log("Error connecting: " + ex.getMessage());
             closeSocket(s);
             if (i2ps != null) {
                 synchronized (sockLock) {
@@ -97,8 +109,8 @@ public class I2PTunnelClient extends I2PTunnelClientBase {
             return null;
         }
         if (size == 1) // skip the rand in the most common case
-            return (Destination)dests.get(0);
+            return dests.get(0);
         int index = I2PAppContext.getGlobalContext().random().nextInt(size);
-        return (Destination)dests.get(index);
+        return dests.get(index);
     }
 }

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

@@ -583,6 +583,8 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
     }
 
     public boolean close(boolean forced) {
+        if (_log.shouldLog(Log.INFO))
+            _log.info("close() called: forced = " + forced + " open = " + open + " sockMgr = " + sockMgr);
         if (!open) return true;
         // FIXME: here we might have to wait quite a long time if
         // there is a connection attempt atm. But without waiting we
@@ -641,7 +643,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
             while (open) {
                 try {
                     synchronized (_waitingSockets) {
-                        if (_waitingSockets.size() <= 0)
+                        if (_waitingSockets.isEmpty())
                             _waitingSockets.wait();
                         else
                             s = (Socket)_waitingSockets.remove(0);

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

@@ -33,7 +33,6 @@ import net.i2p.data.Destination;
 import net.i2p.util.EventDispatcher;
 import net.i2p.util.FileUtil;
 import net.i2p.util.Log;
-
 import net.i2p.util.Translate;
 
 /**
@@ -203,7 +202,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
             if (size <= 0) {
                 if (_log.shouldLog(Log.INFO))
                     _log.info("Proxy list is empty - no outproxy available");
-                l.log("Proxy list is emtpy - no outproxy available");
+                l.log("Proxy list is empty - no outproxy available");
                 return null;
             }
             int index = I2PAppContext.getGlobalContext().random().nextInt(size);
@@ -366,7 +365,17 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
                     int port = 80;
                     if(posPort != -1) {
                         String[] parts = host.split(":");
+                        try {
                         host = parts[0];
+                        } catch (ArrayIndexOutOfBoundsException ex) {
+                        if (out != null) {
+                            out.write(getErrorPage("denied", ERR_REQUEST_DENIED));
+                            writeFooter(out);
+                        }
+                        s.close();
+                        return;
+
+                        }
                         try {
                             port = Integer.parseInt(parts[1]);
                         } catch(Exception exc) {
@@ -437,9 +446,9 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
                                             // Silently bypass correct keys, otherwise alert
                                             String destB64 = null;
                                             try {
-                                                Destination dest = I2PTunnel.destFromName(host);
-                                                if (dest != null)
-                                                    destB64 = dest.toBase64();
+                                                Destination _dest = I2PTunnel.destFromName(host);
+                                                if (_dest != null)
+                                                    destB64 = _dest.toBase64();
                                             } catch (DataFormatException dfe) {}
                                             if (destB64 != null && !destB64.equals(ahelperKey))
                                             {
@@ -498,7 +507,9 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
                         }
 
                         line = method + " " + request.substring(pos);
-                    } else if (host.toLowerCase().equals("localhost") || host.equals("127.0.0.1")) {
+                    } else if (host.toLowerCase().equals("localhost") || host.equals("127.0.0.1") ||
+                               host.startsWith("192.168.")) {
+                        // if somebody is trying to get to 192.168.example.com, oh well
                         if (out != null) {
                             out.write(getErrorPage("localhost", ERR_LOCALHOST));
                             writeFooter(out);
@@ -631,9 +642,14 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
                         newRequest.append("Accept-Encoding: \r\n");
                         newRequest.append("X-Accept-Encoding: x-i2p-gzip;q=1.0, identity;q=0.5, deflate;q=0, gzip;q=0, *;q=0\r\n");
                     }
-                    if (!Boolean.valueOf(getTunnel().getClientOptions().getProperty(PROP_USER_AGENT)).booleanValue())
-                        newRequest.append("User-Agent: MYOB/6.66 (AN/ON)\r\n");
-                    newRequest.append("Connection: close\r\n\r\n");
+                    if (!Boolean.valueOf(getTunnel().getClientOptions().getProperty(PROP_USER_AGENT)).booleanValue()) {
+                        // let's not advertise to external sites that we are from I2P
+                        if (usingWWWProxy)
+                            newRequest.append("User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.6) Gecko/20100625 Firefox/3.6.6\r\n");
+                        else
+                            newRequest.append("User-Agent: MYOB/6.66 (AN/ON)\r\n");
+                    }
+	            newRequest.append("Connection: close\r\n\r\n");
                     break;
                 } else {
                     newRequest.append(line).append("\r\n"); // HTTP spec
@@ -711,24 +727,27 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
             Runnable onTimeout = new OnTimeout(s, s.getOutputStream(), targetRequest, usingWWWProxy, currentProxy, requestId);
             I2PTunnelRunner runner = new I2PTunnelHTTPClientRunner(s, i2ps, sockLock, data, mySockets, onTimeout);
         } catch (SocketException ex) {
-            _log.info(getPrefix(requestId) + "Error trying to connect", ex);
-            l.log(ex.getMessage());
+            if (_log.shouldLog(Log.INFO))
+                _log.info(getPrefix(requestId) + "Error trying to connect", ex);
+            //l.log("Error connecting: " + ex.getMessage());
             handleHTTPClientException(ex, out, targetRequest, usingWWWProxy, currentProxy, requestId);
             closeSocket(s);
         } catch (IOException ex) {
-            _log.info(getPrefix(requestId) + "Error trying to connect", ex);
-            l.log(ex.getMessage());
+            if (_log.shouldLog(Log.INFO))
+                _log.info(getPrefix(requestId) + "Error trying to connect", ex);
+            //l.log("Error connecting: " + ex.getMessage());
             handleHTTPClientException(ex, out, targetRequest, usingWWWProxy, currentProxy, requestId);
             closeSocket(s);
         } catch (I2PException ex) {
-            _log.info("getPrefix(requestId) + Error trying to connect", ex);
-            l.log(ex.getMessage());
+            if (_log.shouldLog(Log.INFO))
+                _log.info("getPrefix(requestId) + Error trying to connect", ex);
+            //l.log("Error connecting: " + ex.getMessage());
             handleHTTPClientException(ex, out, targetRequest, usingWWWProxy, currentProxy, requestId);
             closeSocket(s);
         } catch (OutOfMemoryError oom) {
             IOException ex = new IOException("OOM");
-            _log.info("getPrefix(requestId) + Error trying to connect", ex);
-            l.log(ex.getMessage());
+            _log.error("getPrefix(requestId) + Error trying to connect", oom);
+            //l.log("Error connecting: " + ex.getMessage());
             handleHTTPClientException(ex, out, targetRequest, usingWWWProxy, currentProxy, requestId);
             closeSocket(s);
         }
@@ -740,6 +759,9 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
      *  We can't use BufferedReader for POST because we can't have readahead,
      *  since we are passing the stream on to I2PTunnelRunner for the POST data.
      *
+     *  Warning - BufferedReader removes \r, DataHelper does not
+     *  Warning - DataHelper limits line length, BufferedReader does not
+     *  Todo: Limit line length for buffered reads, or go back to unbuffered for all
      */
     private static class InputReader {
         BufferedReader _br;
@@ -749,11 +771,12 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
             _s = s;
         }
         String readLine(String method) throws IOException {
-             if (method == null || "POST".equals(method))
+             //  Use unbuffered until we can find a BufferedReader that limits line length
+             //if (method == null || "POST".equals(method))
                  return DataHelper.readLine(_s);
-             if (_br == null)
-                 _br = new BufferedReader(new InputStreamReader(_s, "ISO-8859-1"));
-             return _br.readLine();
+             //if (_br == null)
+             //    _br = new BufferedReader(new InputStreamReader(_s, "ISO-8859-1"));
+             //return _br.readLine();
         }
     }
 

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

@@ -151,7 +151,7 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
             _log.warn("Took a while to handle the request [" + timeToHandle + ", socket create: " + (afterSocket-afterAccept) + "]");
     }
     
-    private class CompressedRequestor implements Runnable {
+    private static class CompressedRequestor implements Runnable {
         private Socket _webserver;
         private I2PSocket _browser;
         private String _headers;
@@ -214,7 +214,8 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
             }
         }
     }
-    private class Sender implements Runnable {
+
+    private static class Sender implements Runnable {
         private OutputStream _out;
         private InputStream _in;
         private String _name;
@@ -248,7 +249,8 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
             }
         }
     }
-    private class CompressedResponseOutputStream extends HTTPResponseOutputStream {
+
+    private static class CompressedResponseOutputStream extends HTTPResponseOutputStream {
         private InternalGZIPOutputStream _gzipOut;
         public CompressedResponseOutputStream(OutputStream o) {
             super(o);
@@ -287,7 +289,8 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
                 return 0;
         }
     }
-    private class InternalGZIPOutputStream extends GZIPOutputStream {
+
+    private static class InternalGZIPOutputStream extends GZIPOutputStream {
         public InternalGZIPOutputStream(OutputStream target) throws IOException {
             super(target);
         }
@@ -309,7 +312,7 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
         }
     }
 
-    private String formatHeaders(Properties headers, StringBuilder command) {
+    private static String formatHeaders(Properties headers, StringBuilder command) {
         StringBuilder buf = new StringBuilder(command.length() + headers.size() * 64);
         buf.append(command.toString().trim()).append("\r\n");
         for (Iterator iter = headers.keySet().iterator(); iter.hasNext(); ) {
@@ -321,6 +324,9 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
         return buf.toString();
     }
     
+    /** ridiculously long, just to prevent OOM DOS @since 0.7.13 */
+    private static final int MAX_HEADERS = 60;
+
     private Properties readHeaders(InputStream in, StringBuilder command) throws IOException {
         Properties headers = new Properties();
         StringBuilder buf = new StringBuilder(128);
@@ -344,7 +350,10 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
         if (trimmed > 0)
             getTunnel().getContext().statManager().addRateData("i2ptunnel.httpNullWorkaround", trimmed, 0);
         
+        int i = 0;
         while (true) {
+            if (++i > MAX_HEADERS)
+                throw new IOException("Too many header lines - max " + MAX_HEADERS);
             buf.setLength(0);
             ok = DataHelper.readLine(in, buf);
             if (!ok) throw new IOException("EOF reached before the end of the headers [" + buf.toString() + "]");

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

@@ -17,6 +17,9 @@ import net.i2p.util.EventDispatcher;
 import net.i2p.util.I2PAppThread;
 import net.i2p.util.Log;
 
+/**
+ * Todo: Can we extend I2PTunnelClient instead and remove some duplicated code?
+ */
 public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable {
 
     private static final Log _log = new Log(I2PTunnelIRCClient.class);
@@ -25,7 +28,7 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
     private static volatile long __clientId = 0;
     
     /** list of Destination objects that we point at */
-    protected List dests;
+    protected List<Destination> dests;
     private static final long DEFAULT_READ_TIMEOUT = 5*60*1000; // -1
     protected long readTimeout = DEFAULT_READ_TIMEOUT;
 
@@ -47,7 +50,7 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
               "IRCHandler " + (++__clientId), tunnel, pkf);
         
         StringTokenizer tok = new StringTokenizer(destinations, ", ");
-        dests = new ArrayList(1);
+        dests = new ArrayList(2);
         while (tok.hasMoreTokens()) {
             String destination = tok.nextToken();
             try {
@@ -61,10 +64,21 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
             }
         }
 
-        if (dests.size() <= 0) {
+        if (dests.isEmpty()) {
             l.log("No target destinations found");
             notifyEvent("openClientResult", "error");
-            return;
+            // Nothing is listening for the above event, so it's useless
+            // Maybe figure out where to put a waitEventValue("openClientResult") ??
+            // In the meantime, let's do this the easy way
+            // Note that b32 dests will often not be resolvable at instantiation time;
+            // a delayed resolution system would be even better.
+
+            // Don't close() here, because it does a removeSession() and then
+            // TunnelController can't acquire() it to release() it.
+            //close(true);
+            // Unfortunately, super() built the whole tunnel before we get here.
+            throw new IllegalArgumentException("No valid target destinations found");
+            //return;
         }
         
         setName(getLocalPort() + " -> IRCClient");
@@ -90,7 +104,7 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
         } catch (Exception ex) {
             if (_log.shouldLog(Log.ERROR))
                 _log.error("Error connecting", ex);
-            l.log(ex.getMessage());
+            //l.log("Error connecting: " + ex.getMessage());
             closeSocket(s);
             if (i2ps != null) {
                 synchronized (sockLock) {
@@ -109,9 +123,9 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
             return null;
         }
         if (size == 1) // skip the rand in the most common case
-            return (Destination)dests.get(0);
+            return dests.get(0);
         int index = I2PAppContext.getGlobalContext().random().nextInt(size);
-        return (Destination)dests.get(index);
+        return dests.get(index);
     }
 
     /*************************************************************************
@@ -130,6 +144,7 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
         }
 
         public void run() {
+            // Todo: Don't use BufferedReader - IRC spec limits line length to 512 but...
             BufferedReader in;
             OutputStream output;
             try {
@@ -204,6 +219,7 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
             }
                 
             public void run() {
+                // Todo: Don't use BufferedReader - IRC spec limits line length to 512 but...
                 BufferedReader in;
                 OutputStream output;
                 try {
@@ -371,7 +387,7 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
                 // "QUIT", // replace with a filtered QUIT to hide client quit messages
                 "SILENCE",
                 "MAP", // seems safe enough, the ircd should protect themselves though
-                "PART",
+                // "PART", // replace with filtered PART to hide client part messages
                 "OPER",
                 // "PONG", // replaced with a filtered PING/PONG since some clients send the server IP (thanks aardvax!) 
                 // "PING", 
@@ -475,6 +491,11 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
             return ret;
         }
 
+        if ("PART".equals(command)) {
+            // hide client message
+            return "PART " + field[1] + " :leaving";
+        }
+        
         if ("QUIT".equals(command)) {
             return "QUIT :leaving";
         }

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

@@ -31,6 +31,9 @@ import net.i2p.util.Log;
  *
  * There are three options for mangling the desthash. Put the option in the
  * "custom options" section of i2ptunnel.
+ *   - ircserver.method unset:            Defaults to user.
+ *   - ircserver.method=user:             Use method described above.
+ *   - ircserver.method=webirc:           Use the WEBIRC protocol.
  *   - ircserver.cloakKey unset:          Cloak with a random value that is persistent for
  *                                        the life of this tunnel. This is the default.
  *   - ircserver.cloakKey=somepassphrase: Cloak with the hash of the passphrase. Use this to
@@ -39,6 +42,8 @@ import net.i2p.util.Log;
  *                                        be able to track users even when they switch servers.
  *                                        Note: don't quote or put spaces in the passphrase,
  *                                        the i2ptunnel gui can't handle it.
+ *   - ircserver.webircPassword=password  The password to use for the WEBIRC protocol.
+ *   - ircserver.webircSpoofIP=IP         The IP
  *   - ircserver.fakeHostname=%f.b32.i2p: Set the fake hostname sent by I2PTunnel,
  *                                        %f is the full B32 destination hash
  *                                        %c is the cloaked hash.
@@ -48,7 +53,12 @@ import net.i2p.util.Log;
  * @author zzz
  */
 public class I2PTunnelIRCServer extends I2PTunnelServer implements Runnable {
+    public static final String PROP_METHOD="ircserver.method";
+    public static final String PROP_METHOD_DEFAULT="user";
     public static final String PROP_CLOAK="ircserver.cloakKey";
+    public static final String PROP_WEBIRC_PASSWORD="ircserver.webircPassword";
+	public static final String PROP_WEBIRC_SPOOF_IP="ircserver.webircSpoofIP";
+	public static final String PROP_WEBIRC_SPOOF_IP_DEFAULT="127.0.0.1";
     public static final String PROP_HOSTNAME="ircserver.fakeHostname";
     public static final String PROP_HOSTNAME_DEFAULT="%f.b32.i2p";
     
@@ -67,7 +77,20 @@ public class I2PTunnelIRCServer extends I2PTunnelServer implements Runnable {
 
     /** generate a random 32 bytes, or the hash of the passphrase */
     private void initCloak(I2PTunnel tunnel) {
+        // get the properties of this server-tunnel
         Properties opts = tunnel.getClientOptions();
+        
+        // get method of host faking
+        this.method = opts.getProperty(PROP_METHOD, PROP_METHOD_DEFAULT);
+        assert this.method != null;
+        
+        // get the password for the webirc method
+        this.webircPassword = opts.getProperty(PROP_WEBIRC_PASSWORD);
+
+		// get the spoof IP for the webirc method
+		this.webircSpoofIP = opts.getProperty(PROP_WEBIRC_SPOOF_IP, PROP_WEBIRC_SPOOF_IP_DEFAULT);
+        
+        // get the cloaking passphrase
         String passphrase = opts.getProperty(PROP_CLOAK);
         if (passphrase == null) {
             this.cloakKey = new byte[Hash.HASH_LENGTH];
@@ -76,17 +99,30 @@ public class I2PTunnelIRCServer extends I2PTunnelServer implements Runnable {
             this.cloakKey = SHA256Generator.getInstance().calculateHash(passphrase.trim().getBytes()).getData();
         }
         
+        // get the fake hostmask to use
         this.hostname = opts.getProperty(PROP_HOSTNAME, PROP_HOSTNAME_DEFAULT);
     }
     
     @Override
     protected void blockingHandle(I2PSocket socket) {
         try {
-            // give them 15 seconds to send in the request
-            socket.setReadTimeout(15*1000);
-            InputStream in = socket.getInputStream();
-            String modifiedRegistration = filterRegistration(in, cloakDest(socket.getPeerDestination()));
-            socket.setReadTimeout(readTimeout);
+			String modifiedRegistration;
+			if(!this.method.equals("webirc")) {
+				// give them 15 seconds to send in the request
+				socket.setReadTimeout(15*1000);
+				InputStream in = socket.getInputStream();
+				modifiedRegistration = filterRegistration(in, cloakDest(socket.getPeerDestination()));
+				socket.setReadTimeout(readTimeout);
+			} else {
+				StringBuffer buf = new StringBuffer("WEBIRC ");
+				buf.append(this.webircPassword);
+				buf.append(" cgiirc ");
+				buf.append(cloakDest(socket.getPeerDestination()));
+				buf.append(' ');
+				buf.append(this.webircSpoofIP);
+				buf.append("\r\n");
+				modifiedRegistration = buf.toString();
+			}
             Socket s = new Socket(remoteHost, remotePort);
             new I2PTunnelRunner(s, socket, slock, null, modifiedRegistration.getBytes(), null);
         } catch (SocketException ex) {
@@ -134,7 +170,7 @@ public class I2PTunnelIRCServer extends I2PTunnelServer implements Runnable {
     }
 
     /** keep reading until we see USER or SERVER */
-    private String filterRegistration(InputStream in, String newHostname) throws IOException {
+    private static String filterRegistration(InputStream in, String newHostname) throws IOException {
         StringBuilder buf = new StringBuilder(128);
         int lineCount = 0;
         
@@ -185,4 +221,7 @@ public class I2PTunnelIRCServer extends I2PTunnelServer implements Runnable {
     
     private byte[] cloakKey; // 32 bytes of stuff to scramble the dest with
     private String hostname;
+    private String method;
+    private String webircPassword;
+	private String webircSpoofIP;
 }

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

@@ -213,7 +213,7 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
                 sockMgr.getSession().destroySession();
             } catch (I2PException ex) {
                 _log.error("Error destroying the session", ex);
-                System.exit(1);
+                //System.exit(1);
             }
             l.log("Server shut down.");
             open = false;
@@ -294,6 +294,8 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
     }
     
     protected void blockingHandle(I2PSocket socket) {
+        if (_log.shouldLog(Log.INFO))
+            _log.info("Incoming connection to '" + toString() + "' from: " + socket.getPeerDestination().calculateHash().toBase64());
         long afterAccept = I2PAppContext.getGlobalContext().clock().now();
         long afterSocket = -1;
         //local is fast, so synchronously. Does not need that many

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

@@ -29,8 +29,8 @@ public class TunnelController implements Logging {
     private Log _log;
     private Properties _config;
     private I2PTunnel _tunnel;
-    private List _messages;
-    private List _sessions;
+    private List<String> _messages;
+    private List<I2PSession> _sessions;
     private boolean _running;
     private boolean _starting;
     
@@ -46,6 +46,7 @@ public class TunnelController implements Logging {
     public TunnelController(Properties config, String prefix) {
         this(config, prefix, true);
     }
+
     /**
      * 
      * @param createKey for servers, whether we want to create a brand new destination
@@ -58,17 +59,21 @@ public class TunnelController implements Logging {
         setConfig(config, prefix);
         _messages = new ArrayList(4);
         _running = false;
+        boolean keyOK = true;
         if (createKey && (getType().endsWith("server") || getPersistentClientKey()))
-            createPrivateKey();
-        _starting = getStartOnLoad();
+            keyOK = createPrivateKey();
+        _starting = keyOK && getStartOnLoad();
     }
     
-    private void createPrivateKey() {
+    /**
+     * @return success
+     */
+    private boolean createPrivateKey() {
         I2PClient client = I2PClientFactory.createClient();
         String filename = getPrivKeyFile();
         if ( (filename == null) || (filename.trim().length() <= 0) ) {
             log("No filename specified for the private key");
-            return;
+            return false;
         }
         
         File keyFile = new File(getPrivKeyFile());
@@ -76,7 +81,7 @@ public class TunnelController implements Logging {
             keyFile = new File(I2PAppContext.getGlobalContext().getConfigDir(), getPrivKeyFile());
         if (keyFile.exists()) {
             //log("Not overwriting existing private keys in " + keyFile.getAbsolutePath());
-            return;
+            return true;
         } else {
             File parent = keyFile.getParentFile();
             if ( (parent != null) && (!parent.exists()) )
@@ -94,13 +99,16 @@ public class TunnelController implements Logging {
             if (_log.shouldLog(Log.ERROR))
                 _log.error("Error creating new destination", ie);
             log("Error creating new destination: " + ie.getMessage());
+            return false;
         } catch (IOException ioe) {
             if (_log.shouldLog(Log.ERROR))
                 _log.error("Error creating writing the destination to " + keyFile.getAbsolutePath(), ioe);
             log("Error writing the keys to " + keyFile.getAbsolutePath());
+            return false;
         } finally {
             if (fos != null) try { fos.close(); } catch (IOException ioe) {}
         }
+        return true;
     }
     
     public void startTunnelBackground() {
@@ -120,9 +128,16 @@ public class TunnelController implements Logging {
         } catch (Exception e) {
             _log.error("Error starting up the tunnel", e);
             log("Error starting up the tunnel - " + e.getMessage());
+            // if we don't acquire() then the release() in stopTunnel() won't work
+            acquire();
+            stopTunnel();
         }
         _starting = false;
     }
+
+    /**
+     *  @throws IllegalArgumentException via methods in I2PTunnel
+     */
     private void doStartTunnel() {
         if (_running) {
             if (_log.shouldLog(Log.INFO))
@@ -218,7 +233,12 @@ public class TunnelController implements Logging {
         setListenOn();
         String listenPort = getListenPort();
         String sharedClient = getSharedClient();
-        _tunnel.runSOCKSIRCTunnel(new String[] { listenPort, sharedClient }, this);
+        if (getPersistentClientKey()) {
+            String privKeyFile = getPrivKeyFile(); 
+            _tunnel.runSOCKSIRCTunnel(new String[] { listenPort, "false", privKeyFile }, this);
+        } else {
+            _tunnel.runSOCKSIRCTunnel(new String[] { listenPort, sharedClient }, this);
+        }
     }
     
     /*
@@ -251,15 +271,18 @@ public class TunnelController implements Logging {
      * closed by some other tunnels
      */
     private void acquire() {
-        List sessions = _tunnel.getSessions();
-        if (sessions != null) {
+        List<I2PSession> sessions = _tunnel.getSessions();
+        if (!sessions.isEmpty()) {
             for (int i = 0; i < sessions.size(); i++) {
-                I2PSession session = (I2PSession)sessions.get(i);
+                I2PSession session = sessions.get(i);
+                if (_log.shouldLog(Log.INFO))
+                    _log.info("Acquiring session " + session);
                 TunnelControllerGroup.getInstance().acquire(this, session);
             }
             _sessions = sessions;
         } else {
-            _log.error("No sessions to acquire?");
+            if (_log.shouldLog(Log.WARN))
+                _log.warn("No sessions to acquire? for " + getName());
         }
     }
     
@@ -268,13 +291,16 @@ public class TunnelController implements Logging {
      * no other tunnels are using them, close them.
      */
     private void release() {
-        if (_sessions != null) {
+        if (_sessions != null && !_sessions.isEmpty()) {
             for (int i = 0; i < _sessions.size(); i++) {
-                I2PSession s = (I2PSession)_sessions.get(i);
+                I2PSession s = _sessions.get(i);
+                if (_log.shouldLog(Log.INFO))
+                    _log.info("Releasing session " + s);
                 TunnelControllerGroup.getInstance().release(this, s);
             }
         } else {
-            _log.error("No sessions to release?");
+            if (_log.shouldLog(Log.WARN))
+                _log.warn("No sessions to release? for " + getName());
         }
     }
     
@@ -365,7 +391,7 @@ public class TunnelController implements Logging {
             _tunnel.port = "7654";
         }
     }
-    
+
     public void stopTunnel() {
         _tunnel.runClose(new String[] { "forced", "all" }, this);
         release();
@@ -427,14 +453,16 @@ public class TunnelController implements Logging {
     public String getListenPort() { return _config.getProperty("listenPort"); }
     public String getTargetDestination() { return _config.getProperty("targetDestination"); }
     public String getProxyList() { return _config.getProperty("proxyList"); }
+    /** default true */
     public String getSharedClient() { return _config.getProperty("sharedClient", "true"); }
+    /** default true */
     public boolean getStartOnLoad() { return "true".equalsIgnoreCase(_config.getProperty("startOnLoad", "true")); }
     public boolean getPersistentClientKey() { return Boolean.valueOf(_config.getProperty("option.persistentClientKey")).booleanValue(); }
     public String getMyDestination() {
         if (_tunnel != null) {
-            List sessions = _tunnel.getSessions();
+            List<I2PSession> sessions = _tunnel.getSessions();
             for (int i = 0; i < sessions.size(); i++) {
-                I2PSession session = (I2PSession)sessions.get(i);
+                I2PSession session = sessions.get(i);
                 Destination dest = session.getMyDestination();
                 if (dest != null)
                     return dest.toBase64();
@@ -445,9 +473,9 @@ public class TunnelController implements Logging {
     
     public String getMyDestHashBase32() {
         if (_tunnel != null) {
-            List sessions = _tunnel.getSessions();
+            List<I2PSession> sessions = _tunnel.getSessions();
             for (int i = 0; i < sessions.size(); i++) {
-                I2PSession session = (I2PSession)sessions.get(i);
+                I2PSession session = sessions.get(i);
                 Destination dest = session.getMyDestination();
                 if (dest != null)
                     return Base32.encode(dest.calculateHash().getData());
@@ -549,9 +577,9 @@ public class TunnelController implements Logging {
         if ( (opts != null) && (opts.length() > 0) )
             buf.append("Network options: ").append(opts).append("<br />\n");
         if (_running) {
-            List sessions = _tunnel.getSessions();
+            List<I2PSession> sessions = _tunnel.getSessions();
             for (int i = 0; i < sessions.size(); i++) {
-                I2PSession session = (I2PSession)sessions.get(i);
+                I2PSession session = sessions.get(i);
                 Destination dest = session.getMyDestination();
                 if (dest != null) {
                     buf.append("Destination hash: ").append(dest.calculateHash().toBase64()).append("<br />\n");
@@ -590,7 +618,7 @@ public class TunnelController implements Logging {
      *
      * @return list of messages pulled off (each is a String, earliest first)
      */
-    public List clearMessages() { 
+    public List<String> clearMessages() { 
         List rv = null;
         synchronized (this) {
             rv = new ArrayList(_messages);

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

@@ -25,13 +25,14 @@ import net.i2p.util.Log;
  * Coordinate a set of tunnels within the JVM, loading and storing their config
  * to disk, and building new ones as requested.
  *
+ * Warning - this is a singleton. Todo: fix
  */
 public class TunnelControllerGroup {
-    private Log _log;
+    private final Log _log;
     private static TunnelControllerGroup _instance;
     static final String DEFAULT_CONFIG_FILE = "i2ptunnel.config";
     
-    private List _controllers;
+    private final List<TunnelController> _controllers;
     private String _configFile = DEFAULT_CONFIG_FILE;
     
     /** 
@@ -40,7 +41,7 @@ public class TunnelControllerGroup {
      * no more tunnels are using it)
      *
      */
-    private final Map _sessions;
+    private final Map<I2PSession, Set<TunnelController>> _sessions;
     
     public static TunnelControllerGroup getInstance() { 
         synchronized (TunnelControllerGroup.class) {
@@ -104,7 +105,7 @@ public class TunnelControllerGroup {
     private class StartControllers implements Runnable {
         public void run() {
             for (int i = 0; i < _controllers.size(); i++) {
-                TunnelController controller = (TunnelController)_controllers.get(i);
+                TunnelController controller = _controllers.get(i);
                 if (controller.getStartOnLoad())
                     controller.startTunnel();
             }
@@ -141,10 +142,10 @@ public class TunnelControllerGroup {
      *
      * @return list of messages from the controller as it is stopped
      */
-    public List removeController(TunnelController controller) {
+    public List<String> removeController(TunnelController controller) {
         if (controller == null) return new ArrayList();
         controller.stopTunnel();
-        List msgs = controller.clearMessages();
+        List<String> msgs = controller.clearMessages();
         _controllers.remove(controller);
         msgs.add("Tunnel " + controller.getName() + " removed");
         return msgs;
@@ -155,10 +156,10 @@ public class TunnelControllerGroup {
      *
      * @return list of messages the tunnels generate when stopped
      */
-    public List stopAllControllers() {
-        List msgs = new ArrayList();
+    public List<String> stopAllControllers() {
+        List<String> msgs = new ArrayList();
         for (int i = 0; i < _controllers.size(); i++) {
-            TunnelController controller = (TunnelController)_controllers.get(i);
+            TunnelController controller = _controllers.get(i);
             controller.stopTunnel();
             msgs.addAll(controller.clearMessages());
         }
@@ -172,10 +173,10 @@ public class TunnelControllerGroup {
      *
      * @return list of messages the tunnels generate when started
      */
-    public List startAllControllers() {
-        List msgs = new ArrayList();
+    public List<String> startAllControllers() {
+        List<String> msgs = new ArrayList();
         for (int i = 0; i < _controllers.size(); i++) {
-            TunnelController controller = (TunnelController)_controllers.get(i);
+            TunnelController controller = _controllers.get(i);
             controller.startTunnelBackground();
             msgs.addAll(controller.clearMessages());
         }
@@ -190,10 +191,10 @@ public class TunnelControllerGroup {
      *
      * @return list of messages the tunnels generate when restarted
      */
-    public List restartAllControllers() {
-        List msgs = new ArrayList();
+    public List<String> restartAllControllers() {
+        List<String> msgs = new ArrayList();
         for (int i = 0; i < _controllers.size(); i++) {
-            TunnelController controller = (TunnelController)_controllers.get(i);
+            TunnelController controller = _controllers.get(i);
             controller.restartTunnel();
             msgs.addAll(controller.clearMessages());
         }
@@ -207,10 +208,10 @@ public class TunnelControllerGroup {
      *
      * @return list of messages the tunnels have generated
      */
-    public List clearAllMessages() {
-        List msgs = new ArrayList();
+    public List<String> clearAllMessages() {
+        List<String> msgs = new ArrayList();
         for (int i = 0; i < _controllers.size(); i++) {
-            TunnelController controller = (TunnelController)_controllers.get(i);
+            TunnelController controller = _controllers.get(i);
             msgs.addAll(controller.clearMessages());
         }
         return msgs;
@@ -240,7 +241,7 @@ public class TunnelControllerGroup {
         
         TreeMap map = new TreeMap();
         for (int i = 0; i < _controllers.size(); i++) {
-            TunnelController controller = (TunnelController)_controllers.get(i);
+            TunnelController controller = _controllers.get(i);
             Properties cur = controller.getConfig("tunnel." + i + ".");
             map.putAll(cur);
         }
@@ -296,7 +297,7 @@ public class TunnelControllerGroup {
      *
      * @return list of TunnelController objects
      */
-    public List getControllers() { return _controllers; }
+    public List<TunnelController> getControllers() { return _controllers; }
     
     
     /** 
@@ -306,7 +307,7 @@ public class TunnelControllerGroup {
      */
     void acquire(TunnelController controller, I2PSession session) {
         synchronized (_sessions) {
-            Set owners = (Set)_sessions.get(session);
+            Set<TunnelController> owners = _sessions.get(session);
             if (owners == null) {
                 owners = new HashSet(1);
                 _sessions.put(session, owners);
@@ -326,10 +327,10 @@ public class TunnelControllerGroup {
     void release(TunnelController controller, I2PSession session) {
         boolean shouldClose = false;
         synchronized (_sessions) {
-            Set owners = (Set)_sessions.get(session);
+            Set<TunnelController> owners = _sessions.get(session);
             if (owners != null) {
                 owners.remove(controller);
-                if (owners.size() <= 0) {
+                if (owners.isEmpty()) {
                     if (_log.shouldLog(Log.INFO))
                         _log.info("After releasing session " + session + " by " + controller + ", no more owners remain");
                     shouldClose = true;

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSIRCTunnel.java

@@ -33,8 +33,9 @@ public class I2PSOCKSIRCTunnel extends I2PSOCKSTunnel {
     private static final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(I2PSOCKSIRCTunnel.class);
     private static int __clientId = 0;
 
-    public I2PSOCKSIRCTunnel(int localPort, Logging l, boolean ownDest, EventDispatcher notifyThis, I2PTunnel tunnel) {
-        super(localPort, l, ownDest, notifyThis, tunnel);
+    /** @param pkf private key file name or null for transient key */
+    public I2PSOCKSIRCTunnel(int localPort, Logging l, boolean ownDest, EventDispatcher notifyThis, I2PTunnel tunnel, String pkf) {
+        super(localPort, l, ownDest, notifyThis, tunnel, pkf);
         setName(getLocalPort() + " -> SOCKSIRCTunnel");
     }
 
@@ -45,7 +46,7 @@ public class I2PSOCKSIRCTunnel extends I2PSOCKSTunnel {
     @Override
     protected void clientConnectionRun(Socket s) {
         try {
-            _log.error("SOCKS IRC Tunnel Start");
+            //_log.error("SOCKS IRC Tunnel Start");
             SOCKSServer serv = SOCKSServerFactory.createSOCKSServer(s);
             Socket clientSock = serv.getClientSocket();
             I2PSocket destSock = serv.getDestinationI2PSocket(this);

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java

@@ -33,8 +33,9 @@ public class I2PSOCKSTunnel extends I2PTunnelClientBase {
     //	  I2PSOCKSTunnel(localPort, l, ownDest, (EventDispatcher)null);
     //}
 
-    public I2PSOCKSTunnel(int localPort, Logging l, boolean ownDest, EventDispatcher notifyThis, I2PTunnel tunnel) {
-        super(localPort, ownDest, l, notifyThis, "SOCKSHandler", tunnel);
+    /** @param pkf private key file name or null for transient key */
+    public I2PSOCKSTunnel(int localPort, Logging l, boolean ownDest, EventDispatcher notifyThis, I2PTunnel tunnel, String pkf) {
+        super(localPort, ownDest, l, notifyThis, "SOCKSHandler", tunnel, pkf);
 
         if (waitEventValue("openBaseClientResult").equals("error")) {
             notifyEvent("openSOCKSTunnelResult", "error");

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS4aServer.java

@@ -224,7 +224,7 @@ public class SOCKS4aServer extends SOCKSServer {
                 throw new SOCKSException(err);
             } else {
                 List<String> proxies = t.getProxies(connPort);
-                if (proxies == null || proxies.size() <= 0) {
+                if (proxies == null || proxies.isEmpty()) {
                     String err = "No outproxy configured for port " + connPort + " and no default configured either - host: " + connHostName;
                     _log.error(err);
                     try {

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java

@@ -332,7 +332,7 @@ public class SOCKS5Server extends SOCKSServer {
                 throw new SOCKSException(err);
             } else {
                 List<String> proxies = t.getProxies(connPort);
-                if (proxies == null || proxies.size() <= 0) {
+                if (proxies == null || proxies.isEmpty()) {
                     String err = "No outproxy configured for port " + connPort + " and no default configured either";
                     _log.error(err);
                     try {

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSServerFactory.java

@@ -20,7 +20,7 @@ public class SOCKSServerFactory {
     private final static Log _log = new Log(SOCKSServerFactory.class);
 
     private final static String ERR_REQUEST_DENIED =
-        "HTTP/1.1 403 Access Denied\r\n" +
+        "HTTP/1.1 403 Access Denied - This is a SOCKS proxy, not a HTTP proxy\r\n" +
         "Content-Type: text/html; charset=iso-8859-1\r\n" +
         "Cache-control: no-cache\r\n" +
         "\r\n" +

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSUDPUnwrapper.java

@@ -50,7 +50,7 @@ public class SOCKSUDPUnwrapper implements Source, Sink {
 
         int headerlen = h.getBytes().length;
         byte unwrapped[] = new byte[data.length - headerlen];
-        System.arraycopy(unwrapped, 0, data, headerlen, unwrapped.length);
+        System.arraycopy(data, headerlen, unwrapped, 0, unwrapped.length);
         this.sink.send(dest, unwrapped);
     }
     

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSUDPWrapper.java

@@ -39,8 +39,8 @@ public class SOCKSUDPWrapper implements Source, Sink {
 
         byte[] header = h.getBytes();
         byte wrapped[] = new byte[header.length + data.length];
-        System.arraycopy(wrapped, 0, header, 0, header.length);
-        System.arraycopy(wrapped, header.length, data, 0, data.length);
+        System.arraycopy(header, 0, wrapped, 0, header.length);
+        System.arraycopy(data, 0, wrapped, header.length, data.length);
         this.sink.send(from, wrapped);
     }
     

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

@@ -18,6 +18,10 @@ import net.i2p.i2ptunnel.TunnelControllerGroup;
 
 /**
  * Ugly little accessor for the edit page
+ *
+ * Warning - This class is not part of the i2ptunnel API, and at some point
+ * it will be moved from the jar to the war.
+ * Usage by classes outside of i2ptunnel.war is deprecated.
  */
 public class EditBean extends IndexBean {
     public EditBean() { super(); }
@@ -85,7 +89,7 @@ public class EditBean extends IndexBean {
     }
     
     public boolean isInteractive(int tunnel) {
-        return getProperty(tunnel, "i2p.streaming.maxWindowSize", 128) == 12;
+        return getProperty(tunnel, "i2p.streaming.maxWindowSize", 128) == 16;
     }
     
     public int getTunnelDepth(int tunnel, int defaultLength) {

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

@@ -31,6 +31,9 @@ import net.i2p.util.Log;
 /**
  * Simple accessor for exposing tunnel info, but also an ugly form handler
  *
+ * Warning - This class is not part of the i2ptunnel API, and at some point
+ * it will be moved from the jar to the war.
+ * Usage by classes outside of i2ptunnel.war is deprecated.
  */
 public class IndexBean {
     protected I2PAppContext _context;
@@ -42,8 +45,6 @@ public class IndexBean {
     private long _prevNonce2;
     private long _curNonce;
     private long _nextNonce;
-    /** deprecated unimplemented, now using routerconsole realm */
-    private String _passphrase;
 
     private String _type;
     private String _name;
@@ -82,7 +83,8 @@ public class IndexBean {
     public static final int STANDBY = 4;
     
     /** deprecated unimplemented, now using routerconsole realm */
-    public static final String PROP_TUNNEL_PASSPHRASE = "i2ptunnel.passphrase";
+    //public static final String PROP_TUNNEL_PASSPHRASE = "i2ptunnel.passphrase";
+    public static final String PROP_TUNNEL_PASSPHRASE = "consolePassword";
     static final String PROP_NONCE = IndexBean.class.getName() + ".nonce";
     static final String PROP_NONCE_OLD = PROP_NONCE + '2';
     static final String CLIENT_NICKNAME = "shared clients";
@@ -129,7 +131,6 @@ public class IndexBean {
 
     /** deprecated unimplemented, now using routerconsole realm */
     public void setPassphrase(String phrase) {
-        _passphrase = phrase;
     }
     
     public void setAction(String action) {
@@ -145,20 +146,16 @@ public class IndexBean {
         }
     }
     
-    /** deprecated unimplemented, now using routerconsole realm */
-    private boolean validPassphrase(String proposed) {
-        if (proposed == null) return false;
+    /** just check if console password option is set, jetty will do auth */
+    private boolean validPassphrase() {
         String pass = _context.getProperty(PROP_TUNNEL_PASSPHRASE);
-        if ( (pass != null) && (pass.trim().length() > 0) ) 
-            return pass.trim().equals(proposed.trim());
-        else
-            return false;
+        return pass != null && pass.trim().length() > 0;
     }
     
     private String processAction() {
         if ( (_action == null) || (_action.trim().length() <= 0) || ("Cancel".equals(_action)))
             return "";
-        if ( (_prevNonce != _curNonce) && (_prevNonce2 != _curNonce) && (!validPassphrase(_passphrase)) )
+        if ( (_prevNonce != _curNonce) && (_prevNonce2 != _curNonce) && (!validPassphrase()) )
             return "Invalid form submission, probably because you used the 'back' or 'reload' button on your browser. Please resubmit.";
         if ("Stop all".equals(_action)) 
             return stopAll();

apps/i2ptunnel/jsp/editClient.jsp

@@ -163,23 +163,6 @@
             </div>
          <% } %>
          <% if (!"streamrclient".equals(tunnelType)) { %>
-            <div id="profileField" class="rowItem">
-                <label for="profile" accesskey="f">
-                    <%=intl._("Profile")%>(<span class="accessKey">f</span>):
-                </label>
-                <select id="profile" name="profile" title="Connection Profile" class="selectbox">
-                    <% boolean interactiveProfile = editBean.isInteractive(curTunnel);
-                  %><option <%=(interactiveProfile == true  ? "selected=\"selected\" " : "")%>value="interactive"><%=intl._("interactive connection")%> </option>
-                    <option <%=(interactiveProfile == false ? "selected=\"selected\" " : "")%>value="bulk"><%=intl._("bulk connection (downloads/websites/BT)")%> </option>
-                </select>                
-            </div>
-            <div id="delayConnectField" class="rowItem">
-                <label for="connectDelay" accesskey="y">
-                    <%=intl._("Delay Connect")%>(<span class="accessKey">y</span>):
-                </label>
-                <input value="1000" type="checkbox" id="connectDelay" name="connectDelay" title="Delay Connection"<%=(editBean.shouldDelay(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />                
-                <span class="comment">(<%=intl._("for request/response connections")%>)</span>
-            </div>
             <div id="sharedtField" class="rowItem">
                 <label for="shared" accesskey="h">
                     <%=intl._("Shared Client")%>(<span class="accessKey">h</span>):
@@ -277,7 +260,31 @@
             <div class="subdivider">
                 <hr />
             </div>
-            
+
+         <% if (!"streamrclient".equals(tunnelType)) { %>
+            <div id="profileField" class="rowItem">
+                <label for="profile" accesskey="f">
+                    <%=intl._("Profile")%>(<span class="accessKey">f</span>):
+                </label>
+                <select id="profile" name="profile" title="Connection Profile" class="selectbox">
+                    <% boolean interactiveProfile = editBean.isInteractive(curTunnel);
+                  %><option <%=(interactiveProfile == true  ? "selected=\"selected\" " : "")%>value="interactive"><%=intl._("interactive connection")%> </option>
+                    <option <%=(interactiveProfile == false ? "selected=\"selected\" " : "")%>value="bulk"><%=intl._("bulk connection (downloads/websites/BT)")%> </option>
+                </select>                
+            </div>
+            <div id="delayConnectField" class="rowItem">
+                <label for="connectDelay" accesskey="y">
+                    <%=intl._("Delay Connect")%>(<span class="accessKey">y</span>):
+                </label>
+                <input value="1000" type="checkbox" id="connectDelay" name="connectDelay" title="Delay Connection"<%=(editBean.shouldDelay(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />                
+                <span class="comment">(<%=intl._("for request/response connections")%>)</span>
+            </div>
+
+            <div class="subdivider">
+                <hr />
+            </div>
+         <% } // !streamrclient %>
+
             <div id="optionsField" class="rowItem">
                 <label><%=intl._("I2CP Options")%>:</label>
             </div>
@@ -379,7 +386,7 @@
                 <hr />
             </div>
 
-         <% if ("client".equals(tunnelType) || "ircclient".equals(tunnelType)) { %>
+         <% if ("client".equals(tunnelType) || "ircclient".equals(tunnelType) || "socksirctunnel".equals(tunnelType)) { %>
             <div id="optionsField" class="rowItem">
                 <label for="privKeyFile" accesskey="k">
                     <%=intl._("Persistent private key")%>(<span class="accessKey">k</span>):
@@ -424,9 +431,9 @@
                     <span class="comment"><%=intl._("NOTE: If tunnel is currently running, most changes will not take effect until tunnel is stopped and restarted.")%></span>
                      <div class="separator"><hr /></div>
                     <input type="hidden" value="true" name="removeConfirm" />
-                    <button id="controlSave" accesskey="S" class="control" type="submit" name="action" value="Save changes" title="Save Changes"><%=intl._("Save")%>(<span class="accessKey">S</span>)</button>
-                    <button id="controlDelete" <%=(editBean.allowJS() ? "onclick=\"if (!confirm('Are you sure you want to delete?')) { return false; }\" " : "")%>accesskey="D" class="control" type="submit" name="action" value="Delete this proxy" title="Delete this Proxy"><%=intl._("Delete")%>(<span class="accessKey">D</span>)</button>
                     <button id="controlCancel" class="control" type="submit" name="action" value="" title="Cancel"><%=intl._("Cancel")%></button>
+                    <button id="controlDelete" <%=(editBean.allowJS() ? "onclick=\"if (!confirm('Are you sure you want to delete?')) { return false; }\" " : "")%>accesskey="D" class="control" type="submit" name="action" value="Delete this proxy" title="Delete this Proxy"><%=intl._("Delete")%>(<span class="accessKey">D</span>)</button>
+                    <button id="controlSave" accesskey="S" class="control" type="submit" name="action" value="Save changes" title="Save Changes"><%=intl._("Save")%>(<span class="accessKey">S</span>)</button>
                 </div>
             </div> 
         </div>

apps/i2ptunnel/jsp/editServer.jsp

@@ -187,18 +187,6 @@
                 <input type="text" size="30" id="privKeyFile" name="privKeyFile" title="Path to Private Key File" value="<%=editBean.getPrivateKeyFile(curTunnel)%>" class="freetext" />               
             </div>
 
-         <% if (!"streamrserver".equals(tunnelType)) { %>
-            <div id="profileField" class="rowItem">
-                <label for="profile" accesskey="f">
-                    <%=intl._("Profile")%>(<span class="accessKey">f</span>):
-                </label>
-                <select id="profile" name="profile" title="Connection Profile" class="selectbox">
-                    <% boolean interactiveProfile = editBean.isInteractive(curTunnel);
-                  %><option <%=(interactiveProfile == true  ? "selected=\"selected\" " : "")%>value="interactive"><%=intl._("interactive connection")%> </option>
-                    <option <%=(interactiveProfile == false ? "selected=\"selected\" " : "")%>value="bulk"><%=intl._("bulk connection (downloads/websites/BT)")%> </option>
-                </select>                
-            </div> 
-         <% } // !streamrserver %>
             <div id="destinationField" class="rowItem">
                 <label for="localDestination" accesskey="L">
                     <%=intl._("Local destination")%>(<span class="accessKey">L</span>):
@@ -290,6 +278,23 @@
                 <hr />
             </div>
             
+         <% if (!"streamrserver".equals(tunnelType)) { %>
+            <div id="profileField" class="rowItem">
+                <label for="profile" accesskey="f">
+                    <%=intl._("Profile")%>(<span class="accessKey">f</span>):
+                </label>
+                <select id="profile" name="profile" title="Connection Profile" class="selectbox">
+                    <% boolean interactiveProfile = editBean.isInteractive(curTunnel);
+                  %><option <%=(interactiveProfile == true  ? "selected=\"selected\" " : "")%>value="interactive"><%=intl._("interactive connection")%> </option>
+                    <option <%=(interactiveProfile == false ? "selected=\"selected\" " : "")%>value="bulk"><%=intl._("bulk connection (downloads/websites/BT)")%> </option>
+                </select>                
+            </div> 
+
+            <div class="subdivider">
+                <hr />
+            </div>
+         <% } // !streamrserver %>
+
             <div id="optionsField" class="rowItem">
                 <label><%=intl._("I2CP Options")%>:</label>
             </div>
@@ -341,7 +346,7 @@
            
             <div id="optionsField" class="rowItem">
                 <label for="access" accesskey="s">
-                    <%=intl._("Restricted Access List")%>(<span class="accessKey">s</span>): <i><%=intl._("Unimplemented")%></i>
+                    <%=intl._("Restricted Access List")%>(<span class="accessKey">s</span>):
                 </label>
             </div>
             <div id="portField" class="rowItem">
@@ -457,9 +462,9 @@
                     <span class="comment"><%=intl._("NOTE: If tunnel is currently running, most changes will not take effect until tunnel is stopped and restarted.")%></span>
                     <div class="separator"><hr /></div>
                     <input type="hidden" value="true" name="removeConfirm" />
-                    <button id="controlSave" accesskey="S" class="control" type="submit" name="action" value="Save changes" title="Save Changes"><%=intl._("Save")%>(<span class="accessKey">S</span>)</button>
-                    <button id="controlDelete" <%=(editBean.allowJS() ? "onclick=\"if (!confirm('Are you sure you want to delete?')) { return false; }\" " : "")%>accesskey="D" class="control" type="submit" name="action" value="Delete this proxy" title="Delete this Proxy"><%=intl._("Delete")%>(<span class="accessKey">D</span>)</button>
                     <button id="controlCancel" class="control" type="submit" name="action" value="" title="Cancel"><%=intl._("Cancel")%></button>
+                    <button id="controlDelete" <%=(editBean.allowJS() ? "onclick=\"if (!confirm('Are you sure you want to delete?')) { return false; }\" " : "")%>accesskey="D" class="control" type="submit" name="action" value="Delete this proxy" title="Delete this Proxy"><%=intl._("Delete")%>(<span class="accessKey">D</span>)</button>
+                    <button id="controlSave" accesskey="S" class="control" type="submit" name="action" value="Save changes" title="Save Changes"><%=intl._("Save")%>(<span class="accessKey">S</span>)</button>
                 </div>
             </div> 
         </div>

apps/i2ptunnel/locale/messages_de.po

@@ -1,30 +1,674 @@
-# I2P
-# Copyright (C) 2009 The I2P Project
-# This file is distributed under the same license as the i2ptunnel package.
-# To contribute translations, see http://www.i2p2.de/newdevelopers
-# foo <foo@bar>, 2009.
-# 
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2ptunnel package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# foo <foo@bar>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P i2ptunnel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-10 00:50+0000\n"
-"PO-Revision-Date: 2009-10-19 12:50+0000\n"
-"Last-Translator: foo <foo@bar>\n"
+"POT-Creation-Date: 2010-06-13 19:23+0000\n"
+"PO-Revision-Date: 2010-06-15 14:09+0100\n"
+"Last-Translator: echelon <echelon@i2pmail.org>\n"
 "Language-Team: foo <foo@bar>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: German\n"
 
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:493
+#, java-format
+msgid "To visit the destination in your host database, click <a href=\"{0}\">here</a>. To visit the conflicting addresshelper destination, click <a href=\"{1}\">here</a>."
+msgstr "Um das Ziel in ihrer Host Datenbank zu besuchen, klicken Sie <a href=\"{0}\">hier</a>. Um das Ziel aus der kollidierenden Adresshelfer Anfrage zu besuchen, klicken Sie <a href=\"{1}\">hier</a>."
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:909
+msgid "Click a link below to look for an address helper by using a \"jump\" service:"
+msgstr "Durch klicken auf einen der unten stehenden Links bekommen Sie einen Adresshelfer von einem \"Jump\" Service:"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:369
+msgid "New Tunnel"
+msgstr "Neuer Tunnel"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:389
+msgid "Standard client"
+msgstr "Standard Klient"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:390
+msgid "HTTP client"
+msgstr "HTTP Klient"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:391
+msgid "IRC client"
+msgstr "IRC Klient"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:392
+msgid "Standard server"
+msgstr "Standard Server"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:393
+msgid "HTTP server"
+msgstr "HTTP Server"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:394
+msgid "SOCKS 4/4a/5 proxy"
+msgstr "SOCKS 4/4a/5 Proxy"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:395
+msgid "SOCKS IRC proxy"
+msgstr "SOCKS IRC Proxy"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:396
+msgid "CONNECT/SSL/HTTPS proxy"
+msgstr "CONNECT/SSL/HTTPS Proxy"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:397
+msgid "IRC server"
+msgstr "IRC Server"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:398
+msgid "Streamr client"
+msgstr "Streamr Klient"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:399
+msgid "Streamr server"
+msgstr "Streamr Server"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:400
+msgid "HTTP bidir"
+msgstr "HTTP Bidir"
+
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:73
 msgid "I2P Tunnel Manager - Edit Client Tunnel"
-msgstr ""
+msgstr "I2P Tunnel Manager - Edit Klienten Tunnel"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:93
+msgid "Edit proxy settings"
+msgstr "Editiere Proxy Einstellungen"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:101
+msgid "New proxy settings"
+msgstr "Neue Proxy Einstellungen"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:112
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:112
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:107
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:121
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:242
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
+msgid "Name"
+msgstr "Name"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:116
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:116
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:246
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:270
+msgid "Type"
+msgstr "Typ"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:120
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:120
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:358
+msgid "Description"
+msgstr "Beschreibung"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:126
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:136
+msgid "Target"
+msgstr "Ziel"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:130
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:132
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:167
+msgid "Access Point"
+msgstr "Zugriffspunkt"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:207
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:157
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:172
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:228
+msgid "required"
+msgstr "benötigt"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:150
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:142
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:183
+msgid "Reachable by"
+msgstr "Erreichbar von"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:195
+msgid "Locally (127.0.0.1)"
+msgstr "Lokal (127.0.0.1)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:199
+msgid "Everyone (0.0.0.0)"
+msgstr "Jeder (0.0.0.0)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
+msgid "LAN Hosts (Please specify your LAN address)"
+msgstr "LAN Hosts (Bitte geben Sie ihre LAN Adressen an)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:205
+msgid "Other"
+msgstr "Andere"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:195
+msgid "Outproxies"
+msgstr "Ausgehende Proxies"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:202
+msgid "Tunnel Destination"
+msgstr "Tunnel Ziel"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:214
+msgid "name or destination"
+msgstr "Name oder Ziel"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:220
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:237
+msgid "Profile"
+msgstr "Profil"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:227
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:244
+msgid "interactive connection"
+msgstr "Interaktive Verbindung"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:231
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:248
+msgid "bulk connection (downloads/websites/BT)"
+msgstr "lose Verbindung (Download/Webseiten/BitTorrent)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:233
+msgid "Delay Connect"
+msgstr "Verbindung verzögern"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:237
+msgid "for request/response connections"
+msgstr "für Verbindungen mit Anfragen/Antworten"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
+msgid "Shared Client"
+msgstr "Geteilter Klient"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:243
+msgid "(Share tunnels with other clients and irc/httpclients? Change requires restart of client proxy)"
+msgstr "(Teile Tunnel mit anderen Klienten und IRC/HTTP Klienten? Änderungen benötigen Neustart des Klientenproxys)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:247
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:124
+msgid "Auto Start"
+msgstr "Automatischer Start"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:128
+msgid "(Check the Box for 'YES')"
+msgstr "(Aktiviere die Box für 'JA')"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:253
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+msgid "Advanced networking options"
+msgstr "Erweiterte Netzwerk Optionen"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+msgid "(NOTE: when this client proxy is configured to share tunnels, then these options are for all the shared proxy clients!)"
+msgstr "(HINWEIS: Ist dieser Klienten Proxy auf Teilen der Tunnel konfiguriert, dann gelten diese Optionen für alle Klienten des Proxy Klienten!)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:257
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:268
+msgid "Tunnel Options"
+msgstr "Tunnel Optionen"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:259
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:270
+msgid "Length"
+msgstr "Länge"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:277
+msgid "0 hop tunnel (low anonymity, low latency)"
+msgstr "0 Hop Tunnel (geringe Anonymität, geringe Latenz)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:270
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:281
+msgid "1 hop tunnel (medium anonymity, medium latency)"
+msgstr "1 Hop Tunnel (mittlere Anonymität, mittlere Latenz)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:274
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:285
+msgid "2 hop tunnel (high anonymity, high latency)"
+msgstr "2 Hop Tunnel (hohe Anonymität, hohe Latenz)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:278
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:289
+msgid "3 hop tunnel (very high anonymity, poor performance)"
+msgstr "3 Hop Tunnel (sehr hohe Anonymität, geringe Performance)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:287
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:298
+msgid "hop tunnel (very poor performance)"
+msgstr "Hop Tunnel (sehr geringe Performance)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303
+msgid "Variance"
+msgstr "Varianz"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:299
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:310
+msgid "0 hop variance (no randomisation, consistant performance)"
+msgstr "0 Hop Varianz (keine zufällige Verteilung, konsistente Performance)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:303
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:314
+msgid "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
+msgstr "+ 0-1 Hop Varianz (mittlere, hinzufügende zufällige Verteilung, verringert Performance)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:318
+msgid "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
+msgstr "+ 0-2 Hop Varianz (hohe, hinzufügende zufällige Verteilung, verringert Performance)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:322
+msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
+msgstr "+ 0-1 Hop Varianz (standard zufällige Verteilung, standard Performance)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:315
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:326
+msgid "+/- 0-2 hop variance (not recommended)"
+msgstr "+/- 0-2 Hop Varianz (nicht empfohlen)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:327
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:338
+msgid "hop variance"
+msgstr "Hop Varianz"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:332
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:343
+msgid "Count"
+msgstr "Zähler"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:339
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:350
+msgid "1 inbound, 1 outbound tunnel  (low bandwidth usage, less reliability)"
+msgstr "1 eingehender, 1 ausgehender Tunnel (geringe Bandbreitennutzung, wenig Zuverlässigkeit)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:354
+msgid "2 inbound, 2 outbound tunnels (standard bandwidth usage, standard reliability)"
+msgstr "2 eingehende, 2 ausgehende Tunnel (standard Bandbreitennutzung, standard Zuverlässigkeit)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:347
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:358
+msgid "3 inbound, 3 outbound tunnels (higher bandwidth usage, higher reliability)"
+msgstr "3 eingehende, 3 ausgehende Tunnel (hohe Bandbreitennutzung, hohe Zuverlässigkeit)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:356
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:367
+msgid "tunnels"
+msgstr "Tunnel"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:361
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:372
+msgid "Backup Count"
+msgstr "Anzahl an Ersatz"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:379
+msgid "0 backup tunnels (0 redundancy, no added resource usage)"
+msgstr "0 Backup Tunnel (0 Redundanz, keine zusätzliche Ressourcennutzung)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:383
+msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
+msgstr "1 Backup Tunnel in jede Richtung (geringe Redundanz, geringe Ressourcennutzung)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:376
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:387
+msgid "2 backup tunnels each direction (medium redundancy, medium resource usage)"
+msgstr "2 Backup Tunnel in jede Richtung (mittlere Redundanz, mittlere Ressourcennutzung)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
+msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
+msgstr "3 Backup Tunnel in jede Richtung (hohe Redundanz, hohe Ressourcennutzung)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:389
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:400
+msgid "backup tunnels"
+msgstr "Backup Tunnel"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:405
+msgid "I2CP Options"
+msgstr "I2CP Optionen"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:396
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:146
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:407
+msgid "Host"
+msgstr "Host"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:152
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:244
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:266
+msgid "Port"
+msgstr "Port"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:406
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
+msgid "Reduce tunnel quantity when idle"
+msgstr "Reduziert die Anzahl an Tunnel im Leerlauf"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:422
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:417
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:445
+msgid "Enable"
+msgstr "Aktiviert"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:449
+msgid "Reduced tunnel count"
+msgstr "Reduzierte Tunnel Anzahl"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+msgid "Idle minutes"
+msgstr "Minuten im Leerlauf"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+msgid "Close tunnels when idle"
+msgstr "Schliesse Tunnel im Leerlauf"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:426
+msgid "New Keys on Reopen"
+msgstr "Neue Schlüssel beim Wiederöffnen"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:434
+msgid "Disable"
+msgstr "Deaktiviert"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:440
+msgid "Delay tunnel open until required"
+msgstr "Verzörgere den Tunnelaufbau bis er benötigt wird"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450
+msgid "Persistent private key"
+msgstr "Dauerhafter privater Schlüssel"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
+msgid "File"
+msgstr "Datei"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:252
+msgid "Local destination"
+msgstr "Lokales Ziel"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
+msgid "(if known)"
+msgstr "(falls bekannt)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:468
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:489
+msgid "Custom options"
+msgstr "Eigene Optionen"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:493
+msgid "NOTE: If tunnel is currently running, most changes will not take effect until tunnel is stopped and restarted."
+msgstr "HINWEIS: Falls der Tunnel gerade aktiv ist werden die meisten Änderungen erst nach einem Neustart des Tunnels wirksam."
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:495
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+msgid "Delete"
+msgstr "Löschen"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:480
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
+msgid "Save"
+msgstr "Speichern"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:73
 msgid "I2P Tunnel Manager - Edit Server Tunnel"
-msgstr ""
+msgstr "I2P Tunnel Manager - Edit Server Tunnel"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:93
+msgid "Edit server settings"
+msgstr "Server Einstellungen ändern"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:101
+msgid "New server settings"
+msgstr "Neue Server Einstellungen"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:214
+msgid "Website name"
+msgstr "Name der Webseite"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:218
+msgid "(leave blank for outproxies)"
+msgstr "(für ausgehende Proxies leer lassen)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:223
+msgid "Private key file"
+msgstr "Private Schlüsseldatei"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:262
+msgid "Add to local addressbook"
+msgstr "Zum lokalen Adressbuch hinzufügen"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:415
+msgid "Encrypt Leaseset"
+msgstr "verschlüsseltes Leaseset"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:421
+msgid "Encryption Key"
+msgstr "Schlüssel zum verschlüsseln"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
+msgid "Generate New Key"
+msgstr "Erzeuge neuen Schlüssel"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:427
+msgid "Generate"
+msgstr "Erzeuge"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:487
+msgid "(Tunnel must be stopped first)"
+msgstr "(Tunnel muß zuerst beendet sein)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:431
+msgid "Restricted Access List"
+msgstr "Liste zum beschränktem Zugang"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:437
+msgid "Access List"
+msgstr "Zugangsliste"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:441
+msgid "(Restrict to these clients only)"
+msgstr "(Beschränkt auf nur diese Klienten)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
+msgid "New Certificate type"
+msgstr "Neuer Zertifizierungstyp"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:459
+msgid "None"
+msgstr "Keinen"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
+msgid "Hashcash (effort)"
+msgstr "Hashcash (Durchsatz)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
+msgid "Hashcash Calc Time"
+msgstr "Hashcash Berechnungszeit"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:471
+msgid "Estimate"
+msgstr "Abschätzung"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
+msgid "Hidden"
+msgstr "Versteckt"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
+msgid "Signed (signed by)"
+msgstr "Signiert (unterschrieben von)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:483
+msgid "Modify Certificate"
+msgstr "Zertifikat modifizieren"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:485
+msgid "Modify"
+msgstr "Modifizieren"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:71
 msgid "I2P Tunnel Manager - List"
-msgstr ""
+msgstr "I2P Tunnel Manager - List"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:83
+msgid "Status Messages"
+msgstr "Status Nachrichten"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:87
+msgid "Refresh"
+msgstr "Auffrischen"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:91
+msgid "Stop All"
+msgstr "Alle Stoppen"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:95
+msgid "Start All"
+msgstr "Alle Starten"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
+msgid "Restart All"
+msgstr "Alle neustarten"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:103
+msgid "Reload Config"
+msgstr "Konfiguration neu einlesen"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:105
+msgid "I2P Server Tunnels"
+msgstr "I2P Server Tunnel"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:109
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
+msgid "Points at"
+msgstr "Zeigt auf"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:111
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:157
+msgid "Preview"
+msgstr "Vorschau"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:113
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:177
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:250
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:278
+msgid "Status"
+msgstr "Status"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:163
+msgid "Base32 Address"
+msgstr "Basis-32 Adresse"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:171
+msgid "No Preview"
+msgstr "Keine Vorschau"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:184
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:285
+msgid "Starting..."
+msgstr "Starte..."
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:191
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:205
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:320
+msgid "Stop"
+msgstr "Stop"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:198
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:313
+msgid "Running"
+msgstr "Aktiv"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:212
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:327
+msgid "Stopped"
+msgstr "Gestoppt"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:334
+msgid "Start"
+msgstr "Start"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:234
+msgid "New server tunnel"
+msgstr "Neuer Servertunnel"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:368
+msgid "Standard"
+msgstr "Standard"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:370
+msgid "Create"
+msgstr "Erstelle"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:240
+msgid "I2P Client Tunnels"
+msgstr "I2P Klienten Tunnel"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:248
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:274
+msgid "Interface"
+msgstr "Interface"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:299
+msgid "Standby"
+msgstr "Wartestellung"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:346
+msgid "Outproxy"
+msgstr "Ausgehender Proxy"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:350
+msgid "Destination"
+msgstr "Ziel"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:366
+msgid "New client tunnel"
+msgstr "Neuer Klienten Tunnel"
+

apps/i2ptunnel/locale/messages_nl.po

@@ -0,0 +1,689 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2ptunnel package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# foo <foo@bar>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P i2ptunnel\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-07-04 16:39+0000\n"
+"PO-Revision-Date: 2010-06-15 14:09+0100\n"
+"Last-Translator: duck <duck@mail.i2p>\n"
+"Language-Team: duck <duck@mail.i2p>, monkeybrains <monkeybrains@mail.i2p>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Dutch\n"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:492
+#, java-format
+msgid ""
+"To visit the destination in your host database, click <a href=\"{0}\">here</"
+"a>. To visit the conflicting addresshelper destination, click <a href=\"{1}"
+"\">here</a>."
+msgstr "Om de destination in je host database te bezoeken, klik <a href=\"{0}\">here</a>. Om de conflicterende adreshelper destination te bezoeken, klik <a href=\"{1}\">here</a>."
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:909
+msgid ""
+"Click a link below to look for an address helper by using a \"jump\" service:"
+msgstr "Klik op een onderstaande link om te zoeken naar een adreshelper via een \"jump\" service:"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:372
+msgid "New Tunnel"
+msgstr "Nieuwe Tunnel"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:392
+msgid "Standard client"
+msgstr "Standaard client"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:393
+msgid "HTTP client"
+msgstr "HTTP client"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:394
+msgid "IRC client"
+msgstr "IRC client"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:395
+msgid "Standard server"
+msgstr "Standaard server"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:396
+msgid "HTTP server"
+msgstr "HTTP server"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:397
+msgid "SOCKS 4/4a/5 proxy"
+msgstr "SOCKS 4/4a/5 proxy"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:398
+msgid "SOCKS IRC proxy"
+msgstr "SOCKS IRC proxy"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:399
+msgid "CONNECT/SSL/HTTPS proxy"
+msgstr "CONNECT/SSL/HTTPS proxy"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:400
+msgid "IRC server"
+msgstr "IRC server"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:401
+msgid "Streamr client"
+msgstr "Streamr client"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:402
+msgid "Streamr server"
+msgstr "Streamr server"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:403
+msgid "HTTP bidir"
+msgstr "HTTP bidir"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:73
+msgid "I2P Tunnel Manager - Edit Client Tunnel"
+msgstr "I2P Tunnel Manager - Bewerk Client Tunnel"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:93
+msgid "Edit proxy settings"
+msgstr "Bewerk proxy instellingen"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:101
+msgid "New proxy settings"
+msgstr "Nieuwe proxy instellingen"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:112
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:112
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:107
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:121
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:242
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:257
+msgid "Name"
+msgstr "Naam"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:116
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:116
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:246
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:270
+msgid "Type"
+msgstr "Type"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:120
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:120
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:226
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:358
+msgid "Description"
+msgstr "Omschrijving"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:126
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:136
+msgid "Target"
+msgstr "Doel"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:130
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:132
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:167
+msgid "Access Point"
+msgstr "Toegangspunt"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:179
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:207
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:157
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:172
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:228
+msgid "required"
+msgstr "vereist"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:150
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:142
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:183
+msgid "Reachable by"
+msgstr "Bereikbaar voor"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:195
+msgid "Locally (127.0.0.1)"
+msgstr "Lokaal (127.0.0.1)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:199
+msgid "Everyone (0.0.0.0)"
+msgstr "Iedereen (0.0.0.0)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203
+msgid "LAN Hosts (Please specify your LAN address)"
+msgstr "LAN Hosts (Specificeer je LAN adres)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:186
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:205
+msgid "Other"
+msgstr "Anders"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:195
+msgid "Outproxies"
+msgstr "Uitgaande proxies"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:202
+msgid "Tunnel Destination"
+msgstr "Tunnel Destinations"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:214
+msgid "name or destination"
+msgstr "naam of destination"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:220
+msgid "Shared Client"
+msgstr "Gedeelde Client"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:224
+msgid ""
+"(Share tunnels with other clients and irc/httpclients? Change requires "
+"restart of client proxy)"
+msgstr "(Deel tunnels met andere clients en irc/httpclients? Wijziging vereist herstart van de client proxy)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:228
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:124
+msgid "Auto Start"
+msgstr "Auto Start"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:232
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:128
+msgid "(Check the Box for 'YES')"
+msgstr "(Markeer de Box voor 'JA')"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:234
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:249
+msgid "Advanced networking options"
+msgstr "Geavanceerde netwerk opties"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:236
+msgid ""
+"(NOTE: when this client proxy is configured to share tunnels, then these "
+"options are for all the shared proxy clients!)"
+msgstr "(OPMERKING: wanneer deze client proxy is geconfigureerd om tunnels te delen, dan zijn deze opties van toepassing voor alle gedeelde proxy clients!)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:251
+msgid "Tunnel Options"
+msgstr "Tunnel Opties"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:240
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:253
+msgid "Length"
+msgstr "Lengte"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:247
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:260
+msgid "0 hop tunnel (low anonymity, low latency)"
+msgstr "0 hop tunnel (lage anonimiteit, weinig vertraging)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:264
+msgid "1 hop tunnel (medium anonymity, medium latency)"
+msgstr "1 hop tunnel (gemiddelde anonimiteit, gemiddelde vertraging)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:268
+msgid "2 hop tunnel (high anonymity, high latency)"
+msgstr "2 hop tunnel (hoge anonimiteit, hoge vertraging)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:259
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:272
+msgid "3 hop tunnel (very high anonymity, poor performance)"
+msgstr "3 hop tunnel (zeer hoge anonimiteit, slechte prestatie)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:268
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:281
+msgid "hop tunnel (very poor performance)"
+msgstr "hop tunnel (zeer slechte prestatie)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:273
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:286
+msgid "Variance"
+msgstr "Variantie"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:280
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:293
+msgid "0 hop variance (no randomisation, consistant performance)"
+msgstr "0 hop variantie (geen randomisatie, consistente prestatie)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:284
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:297
+msgid ""
+"+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
+msgstr "+ 0-1 hop variantie (gemiddeld toegevoegde randomisatie, minder prestatie)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:288
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:301
+msgid ""
+"+ 0-2 hop variance (high additive randomisation, subtractive performance)"
+msgstr "+ 0-2 hop variantie (hoge toegevoegde randomisatie, minder prestatie)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305
+msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
+msgstr "+/- 0-1 hop variantie (standaard randomisatie, standaard prestatie)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:296
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
+msgid "+/- 0-2 hop variance (not recommended)"
+msgstr "+/- 0-2 hop variantie (niet aanbevolen)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:321
+msgid "hop variance"
+msgstr "hop variantie"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:313
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:326
+msgid "Count"
+msgstr "Aantal"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:333
+msgid "1 inbound, 1 outbound tunnel  (low bandwidth usage, less reliability)"
+msgstr "1 inkomende, 1 uitgaande tunnel (laag bandbreedte gebruik, minder betrouwbaar)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:324
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:337
+msgid ""
+"2 inbound, 2 outbound tunnels (standard bandwidth usage, standard "
+"reliability)"
+msgstr "2 inkomende, 2 uitgaande tunnels (standaard bandbreedte gebruik, standaard betrouwbaarheid)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
+msgid ""
+"3 inbound, 3 outbound tunnels (higher bandwidth usage, higher reliability)"
+msgstr "3 inkomende, 3 uitgaande tunnels (hoge bandbreedte gebruik, hogere betrouwbaarheid)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:350
+msgid "tunnels"
+msgstr "tunnels"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:355
+msgid "Backup Count"
+msgstr "Backup Aantal"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:349
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:362
+msgid "0 backup tunnels (0 redundancy, no added resource usage)"
+msgstr "0 backup tunnels (0 redundantie, geen additionele bronnen gebruikt)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:353
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:366
+msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
+msgstr "1 backup tunnel in beide richting (lage redundantie, lage aantal bronnen gebruikt)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:357
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370
+msgid ""
+"2 backup tunnels each direction (medium redundancy, medium resource usage)"
+msgstr "2 backup tunnels in beide richting (gemiddelde redundantie, gemiddeld aantal bronnen gebruikt)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:361
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:374
+msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
+msgstr "3 backup tunnels in beide richting (hoge redundantie, hoog aantal bronnen gebruikt)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:370
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:383
+msgid "backup tunnels"
+msgstr "backup tunnels"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:390
+msgid "Profile"
+msgstr "Profiel"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:384
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:397
+msgid "interactive connection"
+msgstr "interactieve connectie"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:388
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:401
+msgid "bulk connection (downloads/websites/BT)"
+msgstr "bulk connection (downloads/websites/BT)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:390
+msgid "Delay Connect"
+msgstr "Vertraagde Connectie"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
+msgid "for request/response connections"
+msgstr "voor request/response connecties"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:405
+msgid "I2CP Options"
+msgstr "I2CP Opties"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:146
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:407
+msgid "Host"
+msgstr "Host"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:152
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:244
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:266
+msgid "Port"
+msgstr "Poort"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
+msgid "Reduce tunnel quantity when idle"
+msgstr "Verminder tunnel aantal wanneer in rust"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:417
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:445
+msgid "Enable"
+msgstr "Ingeschakeld"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:449
+msgid "Reduced tunnel count"
+msgstr "Verminder tunnel aantal"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
+msgid "Idle minutes"
+msgstr "Rust minuten"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:424
+msgid "Close tunnels when idle"
+msgstr "Sluit tunnels wanneer in rust"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
+msgid "New Keys on Reopen"
+msgstr "Nieuwe Sleutels bij Heropenen"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438
+msgid "Disable"
+msgstr "Uitgeschakeld"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:444
+msgid "Delay tunnel open until required"
+msgstr "Vertraag tunnel opening totdat het nodig is"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:454
+msgid "Persistent private key"
+msgstr "Persistente private sleutel"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
+msgid "File"
+msgstr "Bestand"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:235
+msgid "Local destination"
+msgstr "Lokale destination"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:468
+msgid "(if known)"
+msgstr "(indien bekend)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:489
+msgid "Custom options"
+msgstr "Aangepaste opties"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:493
+msgid ""
+"NOTE: If tunnel is currently running, most changes will not take effect "
+"until tunnel is stopped and restarted."
+msgstr "OPMERKING: Indien de tunnel op dit moment draait, zullen de meeste wijzigingen pas effect hebben na het stoppen en herstarten van de tunnel."
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:495
+msgid "Cancel"
+msgstr "Annuleer"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
+msgid "Delete"
+msgstr "Verwijder"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:484
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
+msgid "Save"
+msgstr "Opslaan"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:73
+msgid "I2P Tunnel Manager - Edit Server Tunnel"
+msgstr "I2P Tunnel Manager - Bewerk Server Tunnel"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:93
+msgid "Edit server settings"
+msgstr "Bewerk server instellingen"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:101
+msgid "New server settings"
+msgstr "Nieuwe server instellingen"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:214
+msgid "Website name"
+msgstr "Website naam"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:218
+msgid "(leave blank for outproxies)"
+msgstr "(leeg laten voor uitgaande proxies)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:223
+msgid "Private key file"
+msgstr "Private sleutel bestand"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:245
+msgid "Add to local addressbook"
+msgstr "Toevoegen aan lokaal adresboek"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:415
+msgid "Encrypt Leaseset"
+msgstr "Versleutel Leaseset"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:421
+msgid "Encryption Key"
+msgstr "Encryptie Sleutel"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425
+msgid "Generate New Key"
+msgstr "Genereer Nieuwe Sleutel"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:427
+msgid "Generate"
+msgstr "Genereer"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:487
+msgid "(Tunnel must be stopped first)"
+msgstr "(Tunnel moet eerst gestopt worden)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:431
+msgid "Restricted Access List"
+msgstr "Beperkte Toegangs Lijst"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:437
+msgid "Access List"
+msgstr "Toegangs Lijst"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:441
+msgid "(Restrict to these clients only)"
+msgstr "(Beperkt tot slechts deze clients)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
+msgid "New Certificate type"
+msgstr "Nieuw Certificaat type"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:459
+msgid "None"
+msgstr "Geen"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
+msgid "Hashcash (effort)"
+msgstr "Hashcash (effort)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
+msgid "Hashcash Calc Time"
+msgstr "Hashcash Reken Tijd"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:471
+msgid "Estimate"
+msgstr "Inschatten"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
+msgid "Hidden"
+msgstr "Verborgen"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
+msgid "Signed (signed by)"
+msgstr "Ondertekend (ondertekend door)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:483
+msgid "Modify Certificate"
+msgstr "Wijzig Certificaat"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:485
+msgid "Modify"
+msgstr "Wijzig"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:71
+msgid "I2P Tunnel Manager - List"
+msgstr "I2P Tunnel Manager - Lijst"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:83
+msgid "Status Messages"
+msgstr "Status Berichten"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:87
+msgid "Refresh"
+msgstr "Ververs"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:91
+msgid "Stop All"
+msgstr "Stop Alles"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:95
+msgid "Start All"
+msgstr "Start Alles"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99
+msgid "Restart All"
+msgstr "Herstart Alles"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:103
+msgid "Reload Config"
+msgstr "Herlaad Configuratie"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:105
+msgid "I2P Server Tunnels"
+msgstr "I2P Server Tunnels"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:109
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130
+msgid "Points at"
+msgstr "Verwijst naar"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:111
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:153
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:157
+msgid "Preview"
+msgstr "Preview"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:113
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:177
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:250
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:278
+msgid "Status"
+msgstr "Status"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:163
+msgid "Base32 Address"
+msgstr "Base32 Adres"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:171
+msgid "No Preview"
+msgstr "Geen Preview"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:184
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:285
+msgid "Starting..."
+msgstr "Starten..."
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:191
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:205
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:306
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:320
+msgid "Stop"
+msgstr "Stop"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:198
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:313
+msgid "Running"
+msgstr "Draait"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:212
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:327
+msgid "Stopped"
+msgstr "Gestopt"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:219
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:334
+msgid "Start"
+msgstr "Start"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:234
+msgid "New server tunnel"
+msgstr "Nieuwe server tunnel"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:236
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:368
+msgid "Standard"
+msgstr "Standaard"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:370
+msgid "Create"
+msgstr "Creëer"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:240
+msgid "I2P Client Tunnels"
+msgstr "I2P Client Tunnels"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:248
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:274
+msgid "Interface"
+msgstr "Interface"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:299
+msgid "Standby"
+msgstr "Stand-by"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:346
+msgid "Outproxy"
+msgstr "Uitgaande proxy"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:350
+msgid "Destination"
+msgstr "Destination"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:366
+msgid "New client tunnel"
+msgstr "Nieuwe client tunnel"

apps/i2ptunnel/locale/messages_zh.po

@@ -8,78 +8,82 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P i2ptunnel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-05 12:41+0000\n"
-"PO-Revision-Date: 2010-01-29 15:31+0800\n"
-"Last-Translator: walking <zhazhenzhong@gmail.com>\n"
+"POT-Creation-Date: 2010-07-01 04:52+0000\n"
+"PO-Revision-Date: 2010-05-29 10:57+0800\n"
+"Last-Translator: walking <walking@mail.i2p>\n"
 "Language-Team: foo <foo@bar>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Chinese\n"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:483
-#, fuzzy, java-format
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:493
+#, java-format
 msgid ""
 "To visit the destination in your host database, click <a href=\"{0}\">here</"
 "a>. To visit the conflicting addresshelper destination, click <a href=\"{1}"
 "\">here</a>."
 msgstr ""
-"要访问您本地【地址簿】中规定的主机(相当与IP)，请点击<a href=\"{0}\">这里</"
-"a>。要访问【地址助手】返回的主机请点<a href=\"{1}\">这里</a>(主机的域名会被临"
-"时强制替换)。"
+"域名冲突：要访问您本地【地址簿】中设置的目标主机(相当与IP)，请点击<a href="
+"\"{0}\">这里</a>。要访问【地址助手】返回的目标主机请点<a href=\"{1}\">这里</"
+"a>。"
 
-#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:886
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:909
 msgid ""
 "Click a link below to look for an address helper by using a \"jump\" service:"
 msgstr ""
 "请点击下面的链接通过【跳转(Jump)】服务提供的【地址助手】链接跳转至域名对应的"
 "主机："
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:362
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:369
 msgid "New Tunnel"
 msgstr "新建隧道"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:382
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:389
 msgid "Standard client"
 msgstr "标准客户端"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:383
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:390
 msgid "HTTP client"
 msgstr "HTTP 客户端"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:384
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:391
 msgid "IRC client"
 msgstr "IRC 客户端"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:385
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:392
 msgid "Standard server"
 msgstr "标准服务器"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:386
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:393
 msgid "HTTP server"
 msgstr "HTTP 服务器"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:387
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:394
 msgid "SOCKS 4/4a/5 proxy"
 msgstr "SOCKS4/4A/5 代理"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:388
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:395
+msgid "SOCKS IRC proxy"
+msgstr "SOCKS IRC 代理"
+
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:396
 msgid "CONNECT/SSL/HTTPS proxy"
 msgstr "CONNECT/SSL/HTTPS 代理"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:389
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:397
 msgid "IRC server"
 msgstr "IRC 服务器"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:390
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:398
 msgid "Streamr client"
 msgstr "Streamr 客户端"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:391
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:399
 msgid "Streamr server"
 msgstr "Streamr 服务器"
 
-#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:392
+#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:400
 msgid "HTTP bidir"
 msgstr "双向http"
 
@@ -114,7 +118,7 @@ msgstr "类型"
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:120
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:120
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:226
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:357
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:358
 msgid "Description"
 msgstr "描述"
 
@@ -177,54 +181,31 @@ msgid "name or destination"
 msgstr "名称或描述"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:220
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:237
-msgid "Profile"
-msgstr "连接类型"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:227
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:244
-msgid "interactive connection"
-msgstr "速度连接"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:231
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:248
-msgid "bulk connection (downloads/websites/BT)"
-msgstr "效率连接(下载/WEB/BT)"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:233
-msgid "Delay Connect"
-msgstr "连接延迟断开"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:237
-msgid "for request/response connections"
-msgstr "单请求/响应连接"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
 msgid "Shared Client"
 msgstr "共享客户端"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:243
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:224
 msgid ""
 "(Share tunnels with other clients and irc/httpclients? Change requires "
 "restart of client proxy)"
 msgstr "(与其他客户端例如IRC/HTTP共享隧道？修改需要重新启动)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:247
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:228
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:124
 msgid "Auto Start"
 msgstr "自动启动"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:232
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:128
 msgid "(Check the Box for 'YES')"
 msgstr "(选中表示\"是\")"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:253
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:234
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:249
 msgid "Advanced networking options"
 msgstr "高级网络设置"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:236
 msgid ""
 "(NOTE: when this client proxy is configured to share tunnels, then these "
 "options are for all the shared proxy clients!)"
@@ -232,149 +213,172 @@ msgstr ""
 "(注意:此客户代理被设置使用共享隧道时，这些设置将影响所有使用共享隧道的客户"
 "端!)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:257
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:268
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:251
 msgid "Tunnel Options"
 msgstr "隧道选项"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:259
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:270
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:240
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:253
 msgid "Length"
 msgstr "长度"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:266
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:277
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:247
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:260
 msgid "0 hop tunnel (low anonymity, low latency)"
 msgstr "直连(匿名性无,延迟低)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:270
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:281
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:264
 msgid "1 hop tunnel (medium anonymity, medium latency)"
 msgstr "隧道跳点x1(匿名性中,延迟中)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:274
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:285
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:268
 msgid "2 hop tunnel (high anonymity, high latency)"
 msgstr "隧道跳点x2(匿名性高,延迟高)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:278
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:289
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:259
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:272
 msgid "3 hop tunnel (very high anonymity, poor performance)"
 msgstr "隧道跳点x3(匿名性优,影响性能)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:287
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:298
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:268
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:281
 msgid "hop tunnel (very poor performance)"
 msgstr "跳点隧道(严重影响性能)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:292
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:273
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:286
 msgid "Variance"
 msgstr "随机变化"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:299
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:310
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:280
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:293
 msgid "0 hop variance (no randomisation, consistant performance)"
 msgstr "隧道长度恒定(随机性无,性能稳定)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:303
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:314
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:284
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:297
 msgid ""
 "+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
 msgstr "隧道长度+ 0-1(随机性中,影响性能)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:318
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:288
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:301
 msgid ""
 "+ 0-2 hop variance (high additive randomisation, subtractive performance)"
 msgstr "隧道长度+ 0-2(随机性高,影响性能)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:322
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:292
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305
 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
 msgstr "隧道长度+/- 0-1(随机性标准,正常性能)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:315
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:326
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:296
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309
 msgid "+/- 0-2 hop variance (not recommended)"
 msgstr "隧道程度+/- 0-2(不推荐)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:327
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:338
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:308
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:321
 msgid "hop variance"
 msgstr "节点数量"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:332
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:343
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:313
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:326
 msgid "Count"
 msgstr "计数"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:339
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:350
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:320
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:333
 msgid "1 inbound, 1 outbound tunnel  (low bandwidth usage, less reliability)"
 msgstr "出/入站隧道x1(带宽低,低可靠性)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:354
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:324
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:337
 msgid ""
 "2 inbound, 2 outbound tunnels (standard bandwidth usage, standard "
 "reliability)"
 msgstr "出/入站隧道x2(带宽标准,标准稳定性)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:347
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:328
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341
 msgid ""
 "3 inbound, 3 outbound tunnels (higher bandwidth usage, higher reliability)"
 msgstr "出/入站隧道x3(带宽高,高稳定性)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:356
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:367
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:350
 msgid "tunnels"
 msgstr "隧道"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:361
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:372
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:342
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:355
 msgid "Backup Count"
 msgstr "备用数量"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:379
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:349
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:362
 msgid "0 backup tunnels (0 redundancy, no added resource usage)"
 msgstr "无备用隧道(无冗余,不增加资源占用)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:383
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:353
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:366
 msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
 msgstr "备用隧道对x1 (低冗余,低资源占用)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:376
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:387
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:357
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370
 msgid ""
 "2 backup tunnels each direction (medium redundancy, medium resource usage)"
 msgstr "备用隧道对x2 (中冗余,中资源占用)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:361
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:374
 msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
 msgstr "备用隧道对x3 (高冗余,高资源占用)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:389
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:370
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:383
 msgid "backup tunnels"
 msgstr "备用隧道"
 
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:390
+msgid "Profile"
+msgstr "连接类型"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:384
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:397
+msgid "interactive connection"
+msgstr "速度连接"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:388
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:401
+msgid "bulk connection (downloads/websites/BT)"
+msgstr "效率连接(下载/WEB/BT)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:390
+msgid "Delay Connect"
+msgstr "连接延迟断开"
+
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394
+msgid "for request/response connections"
+msgstr "单请求/响应连接"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:405
 msgid "I2CP Options"
 msgstr "I2CP选项"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:396
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:146
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:407
 msgid "Host"
 msgstr "主机"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:152
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:244
@@ -382,73 +386,73 @@ msgstr "主机"
 msgid "Port"
 msgstr "端口"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:406
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:445
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
 msgid "Reduce tunnel quantity when idle"
 msgstr "空闲时缩减隧道数量"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:422
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:412
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:446
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:417
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:447
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:445
 msgid "Enable"
 msgstr "启用"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:412
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:416
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:449
 msgid "Reduced tunnel count"
 msgstr "削减后的隧道数量"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:416
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
 msgid "Idle minutes"
 msgstr "空闲时间(分钟)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:424
 msgid "Close tunnels when idle"
 msgstr "空闲时关闭隧道"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:426
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
 msgid "New Keys on Reopen"
 msgstr "重新打开隧道时使用新密钥"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:434
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438
 msgid "Disable"
 msgstr "禁用"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:440
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:444
 msgid "Delay tunnel open until required"
 msgstr "仅在请求时打开"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:454
 msgid "Persistent private key"
 msgstr "永久私有密钥"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
 msgid "File"
 msgstr "文件"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:252
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:235
 msgid "Local destination"
 msgstr "本地目标"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:468
 msgid "(if known)"
 msgstr "(如果已知)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:468
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:491
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:489
 msgid "Custom options"
 msgstr "自定义选项"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:495
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:476
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:493
 msgid ""
 "NOTE: If tunnel is currently running, most changes will not take effect "
 "until tunnel is stopped and restarted."
@@ -456,20 +460,20 @@ msgstr ""
 "注意：如果当前隧道已经启动，设置需要【停止】并重新【启动】相应隧道后才能生"
 "效。"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
-msgid "Save"
-msgstr "保存"
-
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:495
+msgid "Cancel"
+msgstr "取消"
+
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:482
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499
 msgid "Delete"
 msgstr "删除"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:480
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503
-msgid "Cancel"
-msgstr "取消"
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:484
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
+msgid "Save"
+msgstr "保存"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:73
 msgid "I2P Tunnel Manager - Edit Server Tunnel"
@@ -495,7 +499,7 @@ msgstr "(出口代理这里请置空)"
 msgid "Private key file"
 msgstr "私钥文件"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:262
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:245
 msgid "Add to local addressbook"
 msgstr "添加至本地地址簿"
 
@@ -516,7 +520,7 @@ msgid "Generate"
 msgstr "生成"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:489
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:487
 msgid "(Tunnel must be stopped first)"
 msgstr "(必须先停止隧道)"
 
@@ -524,51 +528,47 @@ msgstr "(必须先停止隧道)"
 msgid "Restricted Access List"
 msgstr "限制访问列表"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433
-msgid "Unimplemented"
-msgstr "尚未实现"
-
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:439
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:437
 msgid "Access List"
 msgstr "访问列表"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:441
 msgid "(Restrict to these clients only)"
 msgstr "(仅允许这些客户访问)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:459
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457
 msgid "New Certificate type"
 msgstr "新建证书类型"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:459
 msgid "None"
 msgstr "无"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
 msgid "Hashcash (effort)"
 msgstr "Hashcash (强度)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:471
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
 msgid "Hashcash Calc Time"
 msgstr "Hashcash 计算时间"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:471
 msgid "Estimate"
 msgstr "估算"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:475
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
 msgid "Hidden"
 msgstr "隐藏"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:479
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
 msgid "Signed (signed by)"
 msgstr "签名(签名者)"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:485
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:483
 msgid "Modify Certificate"
 msgstr "修改证书"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:487
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:485
 msgid "Modify"
 msgstr "修改"
 
@@ -663,12 +663,12 @@ msgid "New server tunnel"
 msgstr "新建服务器隧道"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:236
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:367
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:368
 msgid "Standard"
 msgstr "标准"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:238
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:369
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:370
 msgid "Create"
 msgstr "创建"
 
@@ -685,14 +685,17 @@ msgstr "网络接口"
 msgid "Standby"
 msgstr "等待"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:345
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:346
 msgid "Outproxy"
 msgstr "出口代理"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:349
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:350
 msgid "Destination"
 msgstr "目标"
 
-#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:365
+#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:366
 msgid "New client tunnel"
 msgstr "新建客户隧道"
+
+#~ msgid "Unimplemented"
+#~ msgstr "尚未实现"

apps/jetty/build.xml

@@ -29,8 +29,8 @@
         <echo message="but strongly recommended, since they are used by some applications" />
         <echo message="on top of I2P, like the router console." />
         <echo message="" />
-        <echo message="Even if you deploy the Jetty archive manually, the build script will" />
-        <echo message="still attempt to verify its checksums, which must be:" />
+        <echo message="Even if you deploy the Jetty archive manually into directory apps/jetty/," />
+        <echo message="the build script will still attempt to verify its checksums, which must be:" />
         <echo message="SHA1 ${jetty.sha1}" />
         <echo message="" />
         <input message="Download Jetty archive automatically?" validargs="y,n" addproperty="jetty.download" />

apps/jetty/java/src/org/mortbay/http/HttpContext.java

@@ -1301,7 +1301,7 @@ public class HttpContext extends Container
 
         List scss= _constraintMap.getMatches(pathInContext);
         String pattern=null;
-        if (scss != null && scss.size() > 0)
+        if (scss != null && !scss.isEmpty())
         {
             Object constraints= null;
 

apps/jetty/java/src/org/mortbay/util/Resource.java

@@ -0,0 +1,431 @@
+// ========================================================================
+// $Id: Resource.java,v 1.32 2009/05/16 01:53:36 gregwilkins Exp $
+// Copyright 1996-2004 Mort Bay Consulting Pty. Ltd.
+// ------------------------------------------------------------------------
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at 
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ========================================================================
+package org.mortbay.util;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Serializable;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.text.DateFormat;
+import java.util.Arrays;
+import java.util.Date;
+
+import org.apache.commons.logging.Log;
+import org.mortbay.log.LogFactory;
+
+
+/* ------------------------------------------------------------ */
+/** Abstract resource class.
+ *
+ * @version $Id: Resource.java,v 1.32 2009/05/16 01:53:36 gregwilkins Exp $
+ * @author Nuno Preguica
+ * @author Greg Wilkins (gregw)
+ */
+public abstract class Resource implements Serializable
+{
+    private static Log log = LogFactory.getLog(Resource.class);
+
+    Object _associate;
+    
+    /* ------------------------------------------------------------ */
+    /** Construct a resource from a url.
+     * @param url A URL.
+     * @return A Resource object.
+     */
+    public static Resource newResource(URL url)
+        throws IOException
+    {
+        if (url==null)
+            return null;
+
+        String urls=url.toExternalForm();
+        if( urls.startsWith( "file:"))
+        {
+            try
+            {
+                FileResource fileResource= new FileResource(url);
+                return fileResource;
+            }
+            catch(Exception e)
+            {
+                log.debug(LogSupport.EXCEPTION,e);
+                return new BadResource(url,e.toString());
+            }
+        }
+        else if( urls.startsWith( "jar:file:"))
+        {
+            return new JarFileResource(url);
+        }
+        else if( urls.startsWith( "jar:"))
+        {
+            return new JarResource(url);
+        }
+
+        return new URLResource(url,null);
+    }
+
+    /* ------------------------------------------------------------ */
+    /** Construct a resource from a string.
+     * @param resource A URL or filename.
+     * @return A Resource object.
+     */
+    public static Resource newResource(String resource)
+        throws MalformedURLException, IOException
+    {
+        URL url=null;
+        try
+        {
+            // Try to format as a URL?
+            url = new URL(resource);
+        }
+        catch(MalformedURLException e)
+        {
+            if(!resource.startsWith("ftp:") &&
+               !resource.startsWith("file:") &&
+               !resource.startsWith("jar:"))
+            {
+                try
+                {
+                    // It's a file.
+                    if (resource.startsWith("./"))
+                        resource=resource.substring(2);
+                    
+                    File file=new File(resource).getCanonicalFile();
+                    url=file.toURI().toURL();                    
+                    
+                    URLConnection connection=url.openConnection();
+                    FileResource fileResource= new FileResource(url,connection,file);
+                    return fileResource;
+                }
+                catch(Exception e2)
+                {
+                    log.debug(LogSupport.EXCEPTION,e2);
+                    throw e;
+                }
+            }
+            else
+            {
+                log.warn("Bad Resource: "+resource);
+                throw e;
+            }
+        }
+
+        String nurl=url.toString();
+        if (nurl.length()>0 &&
+            nurl.charAt(nurl.length()-1)!=
+            resource.charAt(resource.length()-1))
+        {
+            if ((nurl.charAt(nurl.length()-1)!='/' ||
+                 nurl.charAt(nurl.length()-2)!=resource.charAt(resource.length()-1))
+                &&
+                (resource.charAt(resource.length()-1)!='/' ||
+                 resource.charAt(resource.length()-2)!=nurl.charAt(nurl.length()-1)
+                 ))
+            {
+                return new BadResource(url,"Trailing special characters stripped by URL in "+resource);
+            }
+        }
+        return newResource(url);
+    }
+
+    /* ------------------------------------------------------------ */
+    /** Construct a system resource from a string.
+     * The resource is tried as classloader resource before being
+     * treated as a normal resource.
+     */
+    public static Resource newSystemResource(String resource)
+        throws IOException
+    {
+        URL url=null;
+        // Try to format as a URL?
+        ClassLoader
+            loader=Thread.currentThread().getContextClassLoader();
+        if (loader!=null)
+        {
+            url=loader.getResource(resource);
+            if (url==null && resource.startsWith("/"))
+                url=loader.getResource(resource.substring(1));
+        }
+        if (url==null)
+        {
+            loader=Resource.class.getClassLoader();
+            if (loader!=null)
+            {
+                url=loader.getResource(resource);
+                if (url==null && resource.startsWith("/"))
+                    url=loader.getResource(resource.substring(1));
+            }
+        }
+        
+        if (url==null)
+        {
+            url=ClassLoader.getSystemResource(resource);
+            if (url==null && resource.startsWith("/"))
+                url=loader.getResource(resource.substring(1));
+        }
+        
+        if (url==null)
+            return null;
+        
+        return newResource(url);
+    }
+
+    /* ------------------------------------------------------------ */
+    protected void finalize()
+    {
+        release();
+    }
+
+    /* ------------------------------------------------------------ */
+    /** Release any resources held by the resource.
+     */
+    public abstract void release();
+    
+
+    /* ------------------------------------------------------------ */
+    /**
+     * Returns true if the respresened resource exists.
+     */
+    public abstract boolean exists();
+    
+
+    /* ------------------------------------------------------------ */
+    /**
+     * Returns true if the respresenetd resource is a container/directory.
+     * If the resource is not a file, resources ending with "/" are
+     * considered directories.
+     */
+    public abstract boolean isDirectory();
+
+    /* ------------------------------------------------------------ */
+    /**
+     * Returns the last modified time
+     */
+    public abstract long lastModified();
+
+
+    /* ------------------------------------------------------------ */
+    /**
+     * Return the length of the resource
+     */
+    public abstract long length();
+    
+
+    /* ------------------------------------------------------------ */
+    /**
+     * Returns an URL representing the given resource
+     */
+    public abstract URL getURL();
+    
+
+    /* ------------------------------------------------------------ */
+    /**
+     * Returns an File representing the given resource or NULL if this
+     * is not possible.
+     */
+    public abstract File getFile()
+        throws IOException;
+    
+
+    /* ------------------------------------------------------------ */
+    /**
+     * Returns the name of the resource
+     */
+    public abstract String getName();
+    
+
+    /* ------------------------------------------------------------ */
+    /**
+     * Returns an input stream to the resource
+     */
+    public abstract InputStream getInputStream()
+        throws java.io.IOException;
+
+    /* ------------------------------------------------------------ */
+    /**
+     * Returns an output stream to the resource
+     */
+    public abstract OutputStream getOutputStream()
+        throws java.io.IOException, SecurityException;
+    
+    /* ------------------------------------------------------------ */
+    /**
+     * Deletes the given resource
+     */
+    public abstract boolean delete()
+        throws SecurityException;
+    
+    /* ------------------------------------------------------------ */
+    /**
+     * Rename the given resource
+     */
+    public abstract boolean renameTo( Resource dest)
+        throws SecurityException;
+    
+    /* ------------------------------------------------------------ */
+    /**
+     * Returns a list of resource names contained in the given resource
+     * The resource names are not URL encoded.
+     */
+    public abstract String[] list();
+
+    /* ------------------------------------------------------------ */
+    /**
+     * Returns the resource contained inside the current resource with the
+     * given name.
+     * @param path The path segment to add, which should be encoded by the
+     * encode method. 
+     */
+    public abstract Resource addPath(String path)
+        throws IOException,MalformedURLException;
+    
+
+    /* ------------------------------------------------------------ */
+    /** Encode according to this resource type.
+     * The default implementation calls URI.encodePath(uri)
+     * @param uri 
+     * @return String encoded for this resource type.
+     */
+    public String encode(String uri)
+    {
+        return URI.encodePath(uri);
+    }
+    
+        
+    /* ------------------------------------------------------------ */
+    public Object getAssociate()
+    {
+        return _associate;
+    }
+
+    /* ------------------------------------------------------------ */
+    public void setAssociate(Object o)
+    {
+        _associate=o;
+    }
+    
+    /* ------------------------------------------------------------ */
+    /**
+     * @return The canonical Alias of this resource or null if none.
+     */
+    public URL getAlias()
+    {
+        return null;
+    }
+    
+
+    /* ------------------------------------------------------------ */
+    public CachedResource cache()
+        throws IOException
+    {
+        return new CachedResource(this);
+    }
+    
+    /* ------------------------------------------------------------ */
+    /** Get the resource list as a HTML directory listing.
+     * @param base The base URL
+     * @param parent True if the parent directory should be included
+     * @return String of HTML
+     */
+    public String getListHTML(String base,
+                              boolean parent)
+        throws IOException
+    {
+        if (!isDirectory())
+            return null;
+        
+      
+        String[] ls = list();
+        if (ls==null)
+            return null;
+        Arrays.sort(ls);
+        
+        String title = "Directory: "+URI.decodePath(base);
+        title=StringUtil.replace(StringUtil.replace(title,"<","&lt;"),">","&gt;");
+        StringBuffer buf=new StringBuffer(4096);
+        buf.append("<HTML><HEAD><TITLE>");
+        buf.append(title);
+        buf.append("</TITLE></HEAD><BODY>\n<H1>");
+        buf.append(title);
+        buf.append("</H1><TABLE BORDER=0>");
+        
+        if (parent)
+        {
+            buf.append("<TR><TD><A HREF=");
+            buf.append(URI.encodePath(URI.addPaths(base,"../")));
+            buf.append(">Parent Directory</A></TD><TD></TD><TD></TD></TR>\n");
+        }
+        
+        DateFormat dfmt=DateFormat.getDateTimeInstance(DateFormat.MEDIUM,
+                                                       DateFormat.MEDIUM);
+        for (int i=0 ; i< ls.length ; i++)
+        {   
+            String encoded=URI.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
+            //Resource item = addPath(encoded);
+            Resource item = addPath(ls[i]);
+            
+            buf.append("<TR><TD><A HREF=\"");
+            
+            String path=URI.addPaths(base,encoded);
+            
+            if (item.isDirectory() && !path.endsWith("/"))
+                path=URI.addPaths(path,"/");
+            buf.append(path);
+            buf.append("\">");
+            buf.append(StringUtil.replace(StringUtil.replace(ls[i],"<","&lt;"),">","&gt;"));
+            buf.append("&nbsp;");
+            buf.append("</TD><TD ALIGN=right>");
+            buf.append(item.length());
+            buf.append(" bytes&nbsp;</TD><TD>");
+            buf.append(dfmt.format(new Date(item.lastModified())));
+            buf.append("</TD></TR>\n");
+        }
+        buf.append("</TABLE>\n");
+	buf.append("</BODY></HTML>\n");
+        
+        return buf.toString();
+    }
+    
+    /* ------------------------------------------------------------ */
+    /** 
+     * @param out 
+     * @param start First byte to write
+     * @param count Bytes to write or -1 for all of them.
+     */
+    public void writeTo(OutputStream out,long start,long count)
+        throws IOException
+    {
+        InputStream in = getInputStream();
+        try
+        {
+            in.skip(start);
+            if (count<0)
+                IO.copy(in,out);
+            else
+                IO.copy(in,out,(int)count);
+        }
+        finally
+        {
+            in.close();
+        }
+    }    
+}

apps/ministreaming/java/src/net/i2p/client/streaming/I2PServerSocketImpl.java

@@ -69,7 +69,7 @@ class I2PServerSocketImpl implements I2PServerSocket {
         I2PSocket ret = null;
         
         while ( (ret == null) && (!closing) ){
-            while (pendingSockets.size() <= 0) {
+            while (pendingSockets.isEmpty()) {
                 if (closing) throw new ConnectException("I2PServerSocket closed");
                 try {
                     synchronized(socketAddedLock) {
@@ -78,7 +78,7 @@ class I2PServerSocketImpl implements I2PServerSocket {
                 } catch (InterruptedException ie) {}
             }
             synchronized (pendingSockets) {
-                if (pendingSockets.size() > 0) {
+                if (!pendingSockets.isEmpty()) {
                     ret = (I2PSocket)pendingSockets.remove(0);
                 }
             } 

apps/routerconsole/java/bundle-messages.sh

@@ -40,7 +40,10 @@ ROUTERFILES="\
    ../../../router/java/src/net/i2p/router/transport/GetBidsJob.java \
    ../../../router/java/src/net/i2p/router/Blocklist.java \
    ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java \
-   ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java"
+   ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java \
+   ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java \
+   ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java \
+   ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java"
 
 # add ../java/ so the refs will work in the po file
 JPATHS="../java/src ../jsp/WEB-INF ../java/strings $JFILE $ROUTERFILES"
@@ -79,7 +82,7 @@ do
 		# To start a new translation, copy the header from an old translation to the new .po file,
 		# then ant distclean updater.
 		find $JPATHS -name *.java > $TMPFILE
-		xgettext -f $TMPFILE -F -L java --from-code=UTF-8 \
+		xgettext -f $TMPFILE -F -L java --from-code=UTF-8 --add-comments\
 	                 --keyword=_ --keyword=_x --keyword=intl._ --keyword=intl.title \
 	                 --keyword=handler._ --keyword=formhandler._ \
 	                 --keyword=net.i2p.router.web.Messages.getString \

apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java

@@ -9,16 +9,19 @@ public class CSSHelper extends HelperBase {
     
     public static final String PROP_THEME_NAME = "routerconsole.theme";
     public static final String DEFAULT_THEME = "light";
-    private static final String BASE = "/themes/console/";
+    public static final String BASE_THEME_PATH = "/themes/console/";
     private static final String FORCE = "classic";
     public static final String PROP_REFRESH = "routerconsole.summaryRefresh";
     public static final String DEFAULT_REFRESH = "60";
 
     public String getTheme(String userAgent) {
-        String url = BASE;
+        String url = BASE_THEME_PATH;
         if (userAgent != null && userAgent.contains("MSIE")) {
             url += FORCE + "/";
         } else {
+            // This is the first thing to use _context on most pages
+            if (_context == null)
+                throw new IllegalStateException("No contexts. This is usually because the router is either starting up or shutting down.");
             String theme = _context.getProperty(PROP_THEME_NAME, DEFAULT_THEME);
             url += theme + "/";
         }

apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java

@@ -11,7 +11,6 @@ import java.util.Set;
 
 import net.i2p.router.startup.ClientAppConfig;
 import net.i2p.router.startup.LoadClientAppsJob;
-import net.i2p.util.Log;
 
 import org.mortbay.jetty.Server;
 
@@ -19,15 +18,19 @@ import org.mortbay.jetty.Server;
  *  Saves changes to clients.config or webapps.config
  */
 public class ConfigClientsHandler extends FormHandler {
-    private Log configClient_log;
     private Map _settings;
     
-    public ConfigClientsHandler() {
-        configClient_log = ContextHelper.getContext(null).logManager().getLog(ConfigClientsHandler.class);
-    }
-
     @Override
     protected void processForm() {
+        // set action for when CR is hit in a text input box
+        if (_action.length() <= 0) {
+            String url = getJettyString("pluginURL");
+            if (url != null && url.length() > 0)
+                _action = "Install Plugin";
+            else
+                _action = "Save Client Configuration";
+        }
+
         if (_action.equals(_("Save Client Configuration"))) {
             saveClientChanges();
             return;
@@ -200,7 +203,7 @@ public class ConfigClientsHandler extends FormHandler {
             return;
         }
         ClientAppConfig ca = clients.get(i);
-        LoadClientAppsJob.runClient(ca.className, ca.clientName, LoadClientAppsJob.parseArgs(ca.args), configClient_log);
+        LoadClientAppsJob.runClient(ca.className, ca.clientName, LoadClientAppsJob.parseArgs(ca.args), _log);
         addFormNotice(_("Client") + ' ' + _(ca.clientName) + ' ' + _("started") + '.');
     }
 

apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java

@@ -43,11 +43,11 @@ public class ConfigClientsHelper extends HelperBase {
             renderForm(buf, ""+cur, ca.clientName, false, !ca.disabled,
                        "webConsole".equals(ca.clientName) || "Web console".equals(ca.clientName),
                        ca.className + ((ca.args != null) ? " " + ca.args : ""), (""+cur).equals(_edit),
-                       true, false, false, true);
+                       true, false, false, true, ca.disabled);
         }
         
         if ("new".equals(_edit))
-            renderForm(buf, "" + clients.size(), "", false, false, false, "", true, false, false, false, false);
+            renderForm(buf, "" + clients.size(), "", false, false, false, "", true, false, false, false, false, false);
         buf.append("</table>\n");
         return buf.toString();
     }
@@ -65,7 +65,7 @@ public class ConfigClientsHelper extends HelperBase {
                 String val = props.getProperty(name);
                 renderForm(buf, app, app, !"addressbook".equals(app),
                            "true".equals(val), RouterConsoleRunner.ROUTERCONSOLE.equals(app), app + ".war",
-                           false, false, false, false, false);
+                           false, false, false, false, false, true);
             }
         }
         buf.append("</table>\n");
@@ -88,7 +88,7 @@ public class ConfigClientsHelper extends HelperBase {
                 String app = name.substring(PluginStarter.PREFIX.length(), name.lastIndexOf(PluginStarter.ENABLED));
                 String val = props.getProperty(name);
                 Properties appProps = PluginStarter.pluginProperties(_context, app);
-                if (appProps.size() <= 0)
+                if (appProps.isEmpty())
                     continue;
                 StringBuilder desc = new StringBuilder(256);
                 desc.append("<table border=\"0\">")
@@ -147,9 +147,11 @@ public class ConfigClientsHelper extends HelperBase {
                 }
                 desc.append("</table>");
                 boolean enableStop = !Boolean.valueOf(appProps.getProperty("disableStop")).booleanValue();
+                enableStop &= PluginStarter.isPluginRunning(app, _context);
+                boolean enableStart = !PluginStarter.isPluginRunning(app, _context);
                 renderForm(buf, app, app, false,
                            "true".equals(val), false, desc.toString(), false, false,
-                           updateURL != null, enableStop, true);
+                           updateURL != null, enableStop, true, enableStart);
             }
         }
         buf.append("</table>\n");
@@ -160,7 +162,7 @@ public class ConfigClientsHelper extends HelperBase {
     private void renderForm(StringBuilder buf, String index, String name, boolean urlify,
                             boolean enabled, boolean ro, String desc, boolean edit,
                             boolean showEditButton, boolean showUpdateButton, boolean showStopButton,
-                            boolean showDeleteButton) {
+                            boolean showDeleteButton, boolean showStartButton) {
         buf.append("<tr><td class=\"mediumtags\" align=\"right\" width=\"25%\">");
         if (urlify && enabled) {
             String link = "/";
@@ -183,7 +185,7 @@ public class ConfigClientsHelper extends HelperBase {
                 buf.append("disabled=\"true\" ");
         }
         buf.append("></td><td align=\"center\" width=\"15%\">");
-        if ((!enabled) && !edit) {
+        if (showStartButton && (!ro) && !edit) {
             buf.append("<button type=\"submit\" name=\"action\" value=\"Start ").append(index).append("\" >" + _("Start") + "<span class=hide> ").append(index).append("</span></button>");
         }
         if (showEditButton && (!edit) && !ro)

apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java

@@ -145,7 +145,10 @@ public class ConfigNetHandler extends FormHandler {
                 }
                 _context.router().setConfigSetting(UDPTransport.PROP_SOURCES, _udpAutoIP);
                 // Todo: Catch local IPs right here rather than complaining later
-                _context.router().setConfigSetting(UDPTransport.PROP_EXTERNAL_HOST, uhost);
+                if (uhost.length() > 0)
+                    _context.router().setConfigSetting(UDPTransport.PROP_EXTERNAL_HOST, uhost);
+                else
+                    _context.router().removeConfigSetting(UDPTransport.PROP_EXTERNAL_HOST);
                 if ((!oldUdp.equals(_udpAutoIP)) || (!oldUHost.equals(uhost))) {
                    addFormNotice(_("Updating IP address"));
                    restartRequired = true;
@@ -298,6 +301,9 @@ public class ConfigNetHandler extends FormHandler {
         _context.router().shutdownGracefully(Router.EXIT_GRACEFUL_RESTART);
     }
     
+    private static final int DEF_BURST_PCT = 10;
+    private static final int DEF_BURST_TIME = 20;
+
     private void updateRates() {
         boolean updated = false;
 
@@ -310,14 +316,27 @@ public class ConfigNetHandler extends FormHandler {
             }
         }
 
+        // Since burst is now hidden in the gui, set burst to +10% for 20 seconds
         if ( (_inboundRate != null) && (_inboundRate.length() > 0) &&
             !_inboundRate.equals(_context.getProperty(FIFOBandwidthRefiller.PROP_INBOUND_BANDWIDTH, "" + FIFOBandwidthRefiller.DEFAULT_INBOUND_BANDWIDTH))) {
             _context.router().setConfigSetting(FIFOBandwidthRefiller.PROP_INBOUND_BANDWIDTH, _inboundRate);
+            try {
+                int rate = Integer.parseInt(_inboundRate) * (100 + DEF_BURST_PCT) / 100;
+                int kb = DEF_BURST_TIME * rate;
+                _context.router().setConfigSetting(FIFOBandwidthRefiller.PROP_INBOUND_BURST_BANDWIDTH, "" + rate);
+                _context.router().setConfigSetting(FIFOBandwidthRefiller.PROP_INBOUND_BANDWIDTH_PEAK, "" + kb);
+            } catch (NumberFormatException nfe) {}
             updated = true;
         }
         if ( (_outboundRate != null) && (_outboundRate.length() > 0) &&
             !_outboundRate.equals(_context.getProperty(FIFOBandwidthRefiller.PROP_OUTBOUND_BANDWIDTH, "" + FIFOBandwidthRefiller.DEFAULT_OUTBOUND_BANDWIDTH))) {
             _context.router().setConfigSetting(FIFOBandwidthRefiller.PROP_OUTBOUND_BANDWIDTH, _outboundRate);
+            try {
+                int rate = Integer.parseInt(_outboundRate) * (100 + DEF_BURST_PCT) / 100;
+                int kb = DEF_BURST_TIME * rate;
+                _context.router().setConfigSetting(FIFOBandwidthRefiller.PROP_OUTBOUND_BURST_BANDWIDTH, "" + rate);
+                _context.router().setConfigSetting(FIFOBandwidthRefiller.PROP_OUTBOUND_BANDWIDTH_PEAK, "" + kb);
+            } catch (NumberFormatException nfe) {}
             updated = true;
         }
 

apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java

@@ -166,7 +166,8 @@ public class ConfigNetHelper extends HelperBase {
         return kbytesToBits(getShareBandwidth());
     }
     private String kbytesToBits(int kbytes) {
-        return DataHelper.formatSize(kbytes * 8 * 1024) + ' ' + _("bits per second");
+        return DataHelper.formatSize(kbytes * 8 * 1024) + ' ' + _("bits per second") +
+               ' ' + _("or {0} bytes per month maximum", DataHelper.formatSize(kbytes * 1024l * 60 * 60 * 24 * 31));
     }
     public String getInboundBurstRate() {
         return "" + _context.bandwidthLimiter().getInboundBurstKBytesPerSecond();

apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHelper.java

@@ -70,7 +70,7 @@ public class ConfigStatsHelper extends HelperBase {
      * @return true if a valid stat is available, otherwise false
      */
     public boolean hasMoreStats() {
-        if (_stats.size() <= 0)
+        if (_stats.isEmpty())
             return false;
         _currentIsGraphed = false;
         _currentStatName = (String)_stats.remove(0);
@@ -139,9 +139,6 @@ public class ConfigStatsHelper extends HelperBase {
     public boolean getCurrentCanBeGraphed() { return _currentCanBeGraphed; }
     public String getExplicitFilter() { return _filter; }
     public boolean getIsFull() {
-        String f = _context.getProperty(StatManager.PROP_STAT_FULL);
-        if (f != null && f.equals("true"))
-            return true;
-        return false;
+        return _context.getBooleanPropertyDefaultTrue(StatManager.PROP_STAT_FULL);
     }
 }

apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java

@@ -8,11 +8,11 @@ import net.i2p.data.Destination;
 import net.i2p.router.TunnelPoolSettings;
 
 public class ConfigTunnelsHelper extends HelperBase {
-    static final String HOP = _x("hop");
-    static final String TUNNEL = _x("tunnel");
+    private static final String HOP = "hop";
+    private static final String TUNNEL = "tunnel";
     /** dummies for translation */
-    static final String HOPS = _x("hops");
-    static final String TUNNELS = _x("tunnels");
+    private static final String HOPS = ngettext("1 hop", "{0} hops");
+    private static final String TUNNELS = ngettext("1 tunnel", "{0} tunnels");
 
     public ConfigTunnelsHelper() {}
     
@@ -163,7 +163,7 @@ public class ConfigTunnelsHelper extends HelperBase {
         // TunnelPoolOptions, so make the boxes readonly.
         // And let's not display them at all unless they have contents, which should be rare.
         Properties props = in.getUnknownOptions();
-        if (props.size() > 0) {
+        if (!props.isEmpty()) {
             buf.append("<tr><td align=\"right\" class=\"mediumtags\">" + _("Inbound options") + ":</td>\n" +
                        "<td colspan=\"2\" align=\"center\"><input name=\"").append(index);
             buf.append(".inboundOptions\" type=\"text\" size=\"32\" disabled=\"true\" " +
@@ -176,7 +176,7 @@ public class ConfigTunnelsHelper extends HelperBase {
             buf.append("\"></td></tr>\n");
         }
         props = out.getUnknownOptions();
-        if (props.size() > 0) {
+        if (!props.isEmpty()) {
             buf.append("<tr><td align=\"right\" class=\"mediumtags\">" + _("Outbound options") + ":</td>\n" +
                        "<td colspan=\"2\" align=\"center\"><input name=\"").append(index);
             buf.append(".outboundOptions\" type=\"text\" size=\"32\" disabled=\"true\" " +
@@ -196,14 +196,13 @@ public class ConfigTunnelsHelper extends HelperBase {
             buf.append("<option value=\"").append(i).append("\" ");
             if (i == now)
                 buf.append("selected=\"true\" ");
-            String pname;
-            // pluralize and then translate
-            if (i != 1 && i != -1)
-                pname = name + 's';
-            else
-                pname = name;
-            buf.append(">").append(prefix).append(i).append(' ').append(_(pname));
+            buf.append(">").append(_(i, "1 " + name, "{0} " + name + 's'));
             buf.append("</option>\n");
         }
     }
+
+    /** dummy for tagging */
+    private static String ngettext(String s, String p) {
+        return null;
+    }
 }

apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java

@@ -42,12 +42,35 @@ public class ConfigUpdateHandler extends FormHandler {
     public static final String PROP_ZIP_URL = "router.updateUnsignedURL";
     
     public static final String PROP_UPDATE_URL = "router.updateURL";
-    public static final String DEFAULT_UPDATE_URL =
+    /**
+     *  Changed as of release 0.8 to support both .sud and .su2
+     *  Some JVMs (IcedTea) don't have pack200
+     *  Update hosts must maintain both
+     */
+    private static final String PACK200_URLS =
+    "http://echelon.i2p/i2p/i2pupdate.su2\r\n" +
+    "http://stats.i2p/i2p/i2pupdate.su2\r\n" +
+    "http://www.i2p2.i2p/_static/i2pupdate.su2\r\n" +
+    "http://update.postman.i2p/i2pupdate.su2" ;
+
+    private static final String NO_PACK200_URLS =
     "http://echelon.i2p/i2p/i2pupdate.sud\r\n" +
     "http://stats.i2p/i2p/i2pupdate.sud\r\n" +
     "http://www.i2p2.i2p/_static/i2pupdate.sud\r\n" +
     "http://update.postman.i2p/i2pupdate.sud" ;
-    
+
+    public static final String DEFAULT_UPDATE_URL;
+    static {
+        String foo;
+        try {
+            Class.forName("java.util.jar.Pack200", false, ClassLoader.getSystemClassLoader());
+            foo = PACK200_URLS;
+        } catch (ClassNotFoundException cnfe) {
+            foo = NO_PACK200_URLS;
+        }
+        DEFAULT_UPDATE_URL = foo;
+    }
+
     public static final String PROP_TRUSTED_KEYS = "router.trustedUpdateKeys";
     
     

apps/routerconsole/java/src/net/i2p/router/web/ContextHelper.java

@@ -6,9 +6,11 @@ import net.i2p.data.Hash;
 import net.i2p.router.RouterContext;
 
 class ContextHelper {
+
+    /** @throws IllegalStateException if no context available */
     public static RouterContext getContext(String contextId) {
         List contexts = RouterContext.listContexts();
-        if ( (contexts == null) || (contexts.size() <= 0) ) 
+        if ( (contexts == null) || (contexts.isEmpty()) ) 
             throw new IllegalStateException("No contexts. This is usually because the router is either starting up or shutting down.");
         if ( (contextId == null) || (contextId.trim().length() <= 0) )
             return (RouterContext)contexts.get(0);

apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java

@@ -85,16 +85,16 @@ public class FormHandler {
     public String getAllMessages() { 
         validate();
         process();
-        if (_errors.size() <= 0 && _notices.size() <= 0)
+        if (_errors.isEmpty() && _notices.isEmpty())
             return "";
         StringBuilder buf = new StringBuilder(512);
         buf.append("<div class=\"messages\" id=\"messages\"><p>");
-        if (_errors.size() > 0) {
+        if (!_errors.isEmpty()) {
             buf.append("<span class=\"error\">");
             buf.append(render(_errors));
             buf.append("</span>");
         }
-        if (_notices.size() > 0) {
+        if (!_notices.isEmpty()) {
             buf.append("<span class=\"notice\">");
             buf.append(render(_notices));
             buf.append("</span>");
@@ -174,8 +174,8 @@ public class FormHandler {
         }
     }
     
-    private String render(List<String> source) {
-        if (source.size() <= 0) {
+    private static String render(List<String> source) {
+        if (source.isEmpty()) {
             return "";
         } else {
             StringBuilder buf = new StringBuilder(512);

apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java

@@ -79,19 +79,21 @@ public class GraphHelper extends HelperBase {
                            + "&width=" + (3 * _width)
                            + "&height=" + (3 * _height)
                            + "\" / target=\"_blank\">");
+                String title = _("Combined bandwidth graph");
                 _out.write("<img class=\"statimage\" width=\""
                            + (_width + 83) + "\" height=\"" + (_height + 92)
                            + "\" src=\"viewstat.jsp?stat=bw.combined"
                            + "&amp;periodCount=" + _periodCount 
                            + "&amp;width=" + _width
                            + "&amp;height=" + (_height - 14)
-                           + "\" alt=\"Combined bandwidth graph\" title=\"Combined bandwidth graph\"></a>\n");
+                           + "\" alt=\"" + title + "\" title=\"" + title + "\"></a>\n");
             }
             
             for (Iterator iter = ordered.iterator(); iter.hasNext(); ) {
                 SummaryListener lsnr = (SummaryListener)iter.next();
                 Rate r = lsnr.getRate();
-                String title = r.getRateStat().getName() + " for " + DataHelper.formatDuration(_periodCount * r.getPeriod());
+                // e.g. "statname for 60m"
+                String title = _("{0} for {1}", r.getRateStat().getName(), DataHelper.formatDuration(_periodCount * r.getPeriod()));
                 _out.write("<a href=\"viewstat.jsp?stat="
                            + r.getRateStat().getName() 
                            + "&amp;showEvents=" + _showEvents

apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java

@@ -51,6 +51,16 @@ public abstract class HelperBase {
         return Messages.getString(s, o, _context);
     }
 
+    /** two params @since 0.7.14 */
+    public String _(String s, Object o, Object o2) {
+        return Messages.getString(s, o, o2, _context);
+    }
+
+    /** translate (ngettext) @since 0.7.14 */
+    public String _(int n, String s, String p) {
+        return Messages.getString(n, s, p, _context);
+    }
+
     /**
      *  Mark a string for extraction by xgettext and translation.
      *  Use this only in static initializers.

apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java

@@ -32,12 +32,20 @@ public class LocaleWebAppHandler extends WebApplicationHandler
      *  or as specified in the routerconsole.lang property.
      *  Unless language==="en".
      */
+    @Override
     public void handle(String pathInContext,
                        String pathParams,
                        HttpRequest httpRequest,
                        HttpResponse httpResponse)
          throws IOException
     {
+        // Handle OPTIONS (nothing to override)
+        if (HttpRequest.__OPTIONS.equals(httpRequest.getMethod()))
+        {
+            handleOptions(httpRequest, httpResponse);
+            return;
+        }
+
         //System.err.println("Path: " + pathInContext);
         String newPath = pathInContext;
         if (pathInContext.endsWith(".jsp")) {
@@ -66,4 +74,27 @@ public class LocaleWebAppHandler extends WebApplicationHandler
         super.handle(newPath, pathParams, httpRequest, httpResponse);
         //System.err.println("Was handled? " + httpRequest.isHandled());
     }
+
+    /**
+     *  Overrides method in ServletHandler
+     *  @since 0.8
+     */
+    @Override
+    public void handleTrace(HttpRequest request,
+                            HttpResponse response)
+        throws IOException
+    {
+        response.sendError(HttpResponse.__405_Method_Not_Allowed);
+    }
+
+    /**
+     *  Not an override
+     *  @since 0.8
+     */
+    public void handleOptions(HttpRequest request,
+                              HttpResponse response)
+        throws IOException
+    {
+        response.sendError(HttpResponse.__405_Method_Not_Allowed);
+    }
 }

apps/routerconsole/java/src/net/i2p/router/web/Messages.java

@@ -29,4 +29,14 @@ public class Messages extends Translate {
     public static String getString(String s, Object o, I2PAppContext ctx) {
         return Translate.getString(s, o, ctx, BUNDLE_NAME);
     }
+
+    /** two params @since 0.7.14 */
+    public static String getString(String s, Object o, Object o2, I2PAppContext ctx) {
+        return Translate.getString(s, o, o2, ctx, BUNDLE_NAME);
+    }
+
+    /** translate (ngettext) @since 0.7.14 */
+    public static String getString(int n, String s, String p, I2PAppContext ctx) {
+        return Translate.getString(n, s, p, ctx, BUNDLE_NAME);
+    }
 }

apps/routerconsole/java/src/net/i2p/router/web/NavHelper.java

@@ -1,13 +1,16 @@
 package net.i2p.router.web;
 
-import java.util.Iterator;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import net.i2p.I2PAppContext;
 
 public class NavHelper {
-    private static Map<String, String> _apps = new ConcurrentHashMap();
+    private static Map<String, String> _apps = new ConcurrentHashMap(4);
+    private static Map<String, String> _tooltips = new ConcurrentHashMap(4);
     
     /**
      * To register a new client application so that it shows up on the router
@@ -20,20 +23,35 @@ public class NavHelper {
     public static void registerApp(String name, String path) {
         _apps.put(name, path);
     }
+
+    public static void registerApp(String name, String path, String tooltip) {
+        _apps.put(name, path);
+        _tooltips.put(name, tooltip);
+    }
+
     public static void unregisterApp(String name) {
         _apps.remove(name);
+        _tooltips.remove(name);
     }
     
     /**
      *  Translated string is loaded by PluginStarter
      */
     public static String getClientAppLinks(I2PAppContext ctx) {
-        StringBuilder buf = new StringBuilder(1024); 
-        for (Iterator<String> iter = _apps.keySet().iterator(); iter.hasNext(); ) {
-            String name = iter.next();
+        if (_apps.isEmpty())
+            return "";
+        StringBuilder buf = new StringBuilder(256); 
+        List<String> l = new ArrayList(_apps.keySet());
+        Collections.sort(l);
+        for (String name : l) {
             String path = _apps.get(name);
-            buf.append(" <a target=\"_top\" href=\"").append(path).append("\">");
-            buf.append(name).append("</a>");
+            if (path == null)
+                continue;
+            buf.append(" <a target=\"_blank\" href=\"").append(path).append("\" ");
+            String tip = _tooltips.get(name);
+            if (tip != null)
+                buf.append("title=\"").append(tip).append("\" ");
+            buf.append('>').append(name).append("</a>");
         }
         return buf.toString();
     }