From e78dd1fdc3ffc6f0000c3fd5cc6e089fbe66d830 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 24 Nov 2009 20:08:58 +0000 Subject: [PATCH 001/127] remove unused Logs from DataStructures --- core/java/src/net/i2p/data/Address.java | 3 --- core/java/src/net/i2p/data/Certificate.java | 5 ++--- core/java/src/net/i2p/data/DataFormatException.java | 4 +--- core/java/src/net/i2p/data/DataHelper.java | 2 +- core/java/src/net/i2p/data/Destination.java | 3 --- core/java/src/net/i2p/data/Lease.java | 4 +--- core/java/src/net/i2p/data/PrivateKey.java | 2 -- core/java/src/net/i2p/data/PublicKey.java | 3 --- core/java/src/net/i2p/data/RouterAddress.java | 3 --- core/java/src/net/i2p/data/SessionKey.java | 3 --- core/java/src/net/i2p/data/Signature.java | 3 --- core/java/src/net/i2p/data/SigningPrivateKey.java | 2 -- core/java/src/net/i2p/data/SigningPublicKey.java | 3 --- core/java/src/net/i2p/data/TunnelId.java | 3 --- core/java/src/net/i2p/data/VerifiedDestination.java | 3 --- 15 files changed, 5 insertions(+), 41 deletions(-) diff --git a/core/java/src/net/i2p/data/Address.java b/core/java/src/net/i2p/data/Address.java index 3a69a232f..a34f773f3 100644 --- a/core/java/src/net/i2p/data/Address.java +++ b/core/java/src/net/i2p/data/Address.java @@ -4,10 +4,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import net.i2p.util.Log; - public class Address extends DataStructureImpl { - private final static Log _log = new Log(Address.class); private String _hostname; private Destination _destination; diff --git a/core/java/src/net/i2p/data/Certificate.java b/core/java/src/net/i2p/data/Certificate.java index 0fe61e5c0..f20f8322b 100644 --- a/core/java/src/net/i2p/data/Certificate.java +++ b/core/java/src/net/i2p/data/Certificate.java @@ -13,8 +13,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import net.i2p.util.Log; - /** * Defines a certificate that can be attached to various I2P structures, such * as RouterIdentity and Destination, allowing routers and clients to help @@ -23,10 +21,11 @@ import net.i2p.util.Log; * certificate authority, though that use probably isn't appropriate for an * anonymous network ;) * + * Todo: Properly support multiple certificates + * * @author jrandom */ public class Certificate extends DataStructureImpl { - private final static Log _log = new Log(Certificate.class); private int _type; private byte[] _payload; diff --git a/core/java/src/net/i2p/data/DataFormatException.java b/core/java/src/net/i2p/data/DataFormatException.java index 95e0d26c8..290afb5e9 100644 --- a/core/java/src/net/i2p/data/DataFormatException.java +++ b/core/java/src/net/i2p/data/DataFormatException.java @@ -10,7 +10,6 @@ package net.i2p.data; */ import net.i2p.I2PException; -import net.i2p.util.Log; /** * Thrown when the data was not available to read or write a DataStructure @@ -18,7 +17,6 @@ import net.i2p.util.Log; * @author jrandom */ public class DataFormatException extends I2PException { - private final static Log _log = new Log(DataFormatException.class); public DataFormatException(String msg, Throwable t) { super(msg, t); @@ -27,4 +25,4 @@ public class DataFormatException extends I2PException { public DataFormatException(String msg) { super(msg); } -} \ No newline at end of file +} diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java index 96f9a0814..982241581 100644 --- a/core/java/src/net/i2p/data/DataHelper.java +++ b/core/java/src/net/i2p/data/DataHelper.java @@ -294,7 +294,7 @@ public class DataHelper { } /** - * Writes the props to the file, unsorted. + * Writes the props to the file, unsorted (unless props is an OrderedProperties) * Note that this does not escape the \r or \n that are unescaped in loadProps() above. */ public static void storeProps(Properties props, File file) throws IOException { diff --git a/core/java/src/net/i2p/data/Destination.java b/core/java/src/net/i2p/data/Destination.java index 7419e11ed..bebfde69e 100644 --- a/core/java/src/net/i2p/data/Destination.java +++ b/core/java/src/net/i2p/data/Destination.java @@ -14,8 +14,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import net.i2p.util.Log; - /** * Defines an end point in the I2P network. The Destination may move around * in the network, but messages sent to the Destination will find it @@ -23,7 +21,6 @@ import net.i2p.util.Log; * @author jrandom */ public class Destination extends DataStructureImpl { - protected final static Log _log = new Log(Destination.class); protected Certificate _certificate; protected SigningPublicKey _signingKey; protected PublicKey _publicKey; diff --git a/core/java/src/net/i2p/data/Lease.java b/core/java/src/net/i2p/data/Lease.java index eb22d64cf..7a5bde743 100644 --- a/core/java/src/net/i2p/data/Lease.java +++ b/core/java/src/net/i2p/data/Lease.java @@ -15,7 +15,6 @@ import java.io.OutputStream; import java.util.Date; import net.i2p.util.Clock; -import net.i2p.util.Log; /** * Defines the proof that a particular router / tunnel is allowed to receive @@ -24,7 +23,6 @@ import net.i2p.util.Log; * @author jrandom */ public class Lease extends DataStructureImpl { - private final static Log _log = new Log(Lease.class); private Hash _gateway; private TunnelId _tunnelId; private Date _end; @@ -155,4 +153,4 @@ public class Lease extends DataStructureImpl { buf.append("]"); return buf.toString(); } -} \ No newline at end of file +} diff --git a/core/java/src/net/i2p/data/PrivateKey.java b/core/java/src/net/i2p/data/PrivateKey.java index eed7f1eb7..c4c34b0e8 100644 --- a/core/java/src/net/i2p/data/PrivateKey.java +++ b/core/java/src/net/i2p/data/PrivateKey.java @@ -14,7 +14,6 @@ import java.io.InputStream; import java.io.OutputStream; import net.i2p.crypto.KeyGenerator; -import net.i2p.util.Log; /** * Defines the PrivateKey as defined by the I2P data structure spec. @@ -24,7 +23,6 @@ import net.i2p.util.Log; * @author jrandom */ public class PrivateKey extends DataStructureImpl { - private final static Log _log = new Log(PrivateKey.class); private byte[] _data; public final static int KEYSIZE_BYTES = 256; diff --git a/core/java/src/net/i2p/data/PublicKey.java b/core/java/src/net/i2p/data/PublicKey.java index 01bca46e5..3496f8d55 100644 --- a/core/java/src/net/i2p/data/PublicKey.java +++ b/core/java/src/net/i2p/data/PublicKey.java @@ -13,8 +13,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import net.i2p.util.Log; - /** * Defines the PublicKey as defined by the I2P data structure spec. * A public key is 256byte Integer. The public key represents only the @@ -23,7 +21,6 @@ import net.i2p.util.Log; * @author jrandom */ public class PublicKey extends DataStructureImpl { - private final static Log _log = new Log(PublicKey.class); private byte[] _data; public final static int KEYSIZE_BYTES = 256; diff --git a/core/java/src/net/i2p/data/RouterAddress.java b/core/java/src/net/i2p/data/RouterAddress.java index f353f7d73..0f03d9d34 100644 --- a/core/java/src/net/i2p/data/RouterAddress.java +++ b/core/java/src/net/i2p/data/RouterAddress.java @@ -16,15 +16,12 @@ import java.util.Date; import java.util.Iterator; import java.util.Properties; -import net.i2p.util.Log; - /** * Defines a method of communicating with a router * * @author jrandom */ public class RouterAddress extends DataStructureImpl { - private final static Log _log = new Log(RouterAddress.class); private int _cost; private Date _expiration; private String _transportStyle; diff --git a/core/java/src/net/i2p/data/SessionKey.java b/core/java/src/net/i2p/data/SessionKey.java index 17190ef3f..deaf292b5 100644 --- a/core/java/src/net/i2p/data/SessionKey.java +++ b/core/java/src/net/i2p/data/SessionKey.java @@ -13,8 +13,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import net.i2p.util.Log; - /** * Defines the SessionKey as defined by the I2P data structure spec. * A session key is 32byte Integer. @@ -22,7 +20,6 @@ import net.i2p.util.Log; * @author jrandom */ public class SessionKey extends DataStructureImpl { - private final static Log _log = new Log(SessionKey.class); private byte[] _data; private Object _preparedKey; diff --git a/core/java/src/net/i2p/data/Signature.java b/core/java/src/net/i2p/data/Signature.java index cb43741c5..2c35edebc 100644 --- a/core/java/src/net/i2p/data/Signature.java +++ b/core/java/src/net/i2p/data/Signature.java @@ -13,8 +13,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import net.i2p.util.Log; - /** * Defines the signature as defined by the I2P data structure spec. * A signature is a 40byte Integer verifying the authenticity of some data @@ -23,7 +21,6 @@ import net.i2p.util.Log; * @author jrandom */ public class Signature extends DataStructureImpl { - private final static Log _log = new Log(Signature.class); private byte[] _data; public final static int SIGNATURE_BYTES = 40; diff --git a/core/java/src/net/i2p/data/SigningPrivateKey.java b/core/java/src/net/i2p/data/SigningPrivateKey.java index 1d2e95cb0..3c1e71254 100644 --- a/core/java/src/net/i2p/data/SigningPrivateKey.java +++ b/core/java/src/net/i2p/data/SigningPrivateKey.java @@ -14,7 +14,6 @@ import java.io.InputStream; import java.io.OutputStream; import net.i2p.crypto.KeyGenerator; -import net.i2p.util.Log; /** * Defines the SigningPrivateKey as defined by the I2P data structure spec. @@ -25,7 +24,6 @@ import net.i2p.util.Log; * @author jrandom */ public class SigningPrivateKey extends DataStructureImpl { - private final static Log _log = new Log(SigningPrivateKey.class); private byte[] _data; public final static int KEYSIZE_BYTES = 20; diff --git a/core/java/src/net/i2p/data/SigningPublicKey.java b/core/java/src/net/i2p/data/SigningPublicKey.java index 44b8f3c13..2d2cf2f9b 100644 --- a/core/java/src/net/i2p/data/SigningPublicKey.java +++ b/core/java/src/net/i2p/data/SigningPublicKey.java @@ -13,8 +13,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import net.i2p.util.Log; - /** * Defines the SigningPublicKey as defined by the I2P data structure spec. * A public key is 256byte Integer. The public key represents only the @@ -24,7 +22,6 @@ import net.i2p.util.Log; * @author jrandom */ public class SigningPublicKey extends DataStructureImpl { - private final static Log _log = new Log(SigningPublicKey.class); private byte[] _data; public final static int KEYSIZE_BYTES = 128; diff --git a/core/java/src/net/i2p/data/TunnelId.java b/core/java/src/net/i2p/data/TunnelId.java index e9ed13cff..c692d70c8 100644 --- a/core/java/src/net/i2p/data/TunnelId.java +++ b/core/java/src/net/i2p/data/TunnelId.java @@ -12,8 +12,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import net.i2p.util.Log; - /** * Defines the tunnel ID that messages are passed through on a set of routers. * This is not globally unique, but must be unique on each router making up @@ -23,7 +21,6 @@ import net.i2p.util.Log; * @author jrandom */ public class TunnelId extends DataStructureImpl { - private final static Log _log = new Log(TunnelId.class); private long _tunnelId; private int _type; diff --git a/core/java/src/net/i2p/data/VerifiedDestination.java b/core/java/src/net/i2p/data/VerifiedDestination.java index 19fd1079e..dee86800d 100644 --- a/core/java/src/net/i2p/data/VerifiedDestination.java +++ b/core/java/src/net/i2p/data/VerifiedDestination.java @@ -13,8 +13,6 @@ import java.security.NoSuchAlgorithmException; import com.nettgryppa.security.HashCash; -import net.i2p.util.Log; - /** * Extend Destination with methods to verify its Certificate. * The router does not check Certificates, it doesn't care. @@ -26,7 +24,6 @@ import net.i2p.util.Log; * @author zzz */ public class VerifiedDestination extends Destination { - protected final static Log _log = new Log(Destination.class); public VerifiedDestination() { super(); From 94faf74aa477bc0602f9352e93d2b0c7b4d55d05 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 24 Nov 2009 20:12:27 +0000 Subject: [PATCH 002/127] * Streaming: - When an "immediate" ack is requested, do it within 250 ms (was 2000) - Request immediate acks when < 1/3 of window remains, or when < 3 packets remain in window, and every 8 packets (was when < 2 packets in window remain) - Change requested delay to RTT/2 (was RTO/2) - Log cleanup and javadoc --- .../net/i2p/client/streaming/Connection.java | 68 +++++++++++++------ .../streaming/ConnectionDataReceiver.java | 8 +-- .../client/streaming/ConnectionOptions.java | 13 +++- .../streaming/ConnectionPacketHandler.java | 23 +++++-- .../src/net/i2p/client/streaming/Packet.java | 2 +- 5 files changed, 78 insertions(+), 36 deletions(-) diff --git a/apps/streaming/java/src/net/i2p/client/streaming/Connection.java b/apps/streaming/java/src/net/i2p/client/streaming/Connection.java index 9435727c4..aa826f799 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/Connection.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/Connection.java @@ -189,9 +189,9 @@ public class Connection { + _activeResends + "), waiting " + timeLeft); try { _outboundPackets.wait(Math.min(timeLeft,250l)); } catch (InterruptedException ie) { if (_log.shouldLog(Log.DEBUG)) _log.debug("InterruptedException while Outbound window is full (" + _outboundPackets.size() + "/" + _activeResends +")"); return false;} } else { - if (_log.shouldLog(Log.DEBUG)) - _log.debug("Outbound window is full (" + _outboundPackets.size() + "/" + _activeResends - + "), waiting indefinitely"); + //if (_log.shouldLog(Log.DEBUG)) + // _log.debug("Outbound window is full (" + _outboundPackets.size() + "/" + _activeResends + // + "), waiting indefinitely"); try { _outboundPackets.wait(250); } catch (InterruptedException ie) {if (_log.shouldLog(Log.DEBUG)) _log.debug("InterruptedException while Outbound window is full (" + _outboundPackets.size() + "/" + _activeResends + ")"); return false;} //10*1000 } } else { @@ -297,37 +297,48 @@ public class Connection { if ( (packet.getSequenceNum() == 0) && (!packet.isFlagSet(Packet.FLAG_SYNCHRONIZE)) ) { ackOnly = true; - if (_log.shouldLog(Log.DEBUG)) - _log.debug("No resend for " + packet); + //if (_log.shouldLog(Log.DEBUG)) + // _log.debug("No resend for " + packet); } else { - int remaining = 0; + int windowSize; + int remaining; synchronized (_outboundPackets) { _outboundPackets.put(new Long(packet.getSequenceNum()), packet); - remaining = _options.getWindowSize() - _outboundPackets.size() ; + windowSize = _options.getWindowSize(); + remaining = windowSize - _outboundPackets.size() ; _outboundPackets.notifyAll(); } - if (remaining < 0) - remaining = 0; - if (packet.isFlagSet(Packet.FLAG_CLOSE) || (remaining < 2)) { + // the other end has no idea what our window size is, so + // help him out by requesting acks below the 1/3 point, + // if remaining < 3, and every 8 minimum. + if (packet.isFlagSet(Packet.FLAG_CLOSE) || + (remaining < (windowSize + 2) / 3) || + (remaining < 3) || + (packet.getSequenceNum() % 8 == 0)) { packet.setOptionalDelay(0); packet.setFlag(Packet.FLAG_DELAY_REQUESTED); if (_log.shouldLog(Log.DEBUG)) _log.debug("Requesting no ack delay for packet " + packet); } else { - int delay = _options.getRTO() / 2; + // This is somewhat of a waste of time, unless the RTT < 4000, + // since the other end limits it to getSendAckDelay() + // which is always 2000, but it's good for diagnostics to see what the other end thinks + // the RTT is. + int delay = _options.getRTT() / 2; packet.setOptionalDelay(delay); if (delay > 0) packet.setFlag(Packet.FLAG_DELAY_REQUESTED); if (_log.shouldLog(Log.DEBUG)) _log.debug("Requesting ack delay of " + delay + "ms for packet " + packet); } + // WHY always set? packet.setFlag(Packet.FLAG_DELAY_REQUESTED); long timeout = _options.getRTO(); if (timeout > MAX_RESEND_DELAY) timeout = MAX_RESEND_DELAY; if (_log.shouldLog(Log.DEBUG)) - _log.debug("Resend in " + timeout + " for " + packet, new Exception("Sent by")); + _log.debug("Resend in " + timeout + " for " + packet); // schedules itself ResendPacketEvent rpe = new ResendPacketEvent(packet, timeout); @@ -370,6 +381,10 @@ public class Connection { } *********/ + /** + * Process the acks and nacks received in a packet + * @return List of packets acked or null + */ List ackPackets(long ackThrough, long nacks[]) { if (ackThrough < _highestAckedThrough) { // dupack which won't tell us anything @@ -685,6 +700,14 @@ public class Connection { * @return the next time the scheduler will want to send a packet, or -1 if never. */ public long getNextSendTime() { return _nextSendTime; } + + /** + * If the next send time is currently >= 0 (i.e. not "never"), + * this may make the next time sooner but will not make it later. + * If the next send time is currently < 0 (i.e. "never"), + * this will set it to the time specified, but not later than + * options.getSendAckDelay() from now (2000 ms) + */ public void setNextSendTime(long when) { if (_nextSendTime >= 0) { if (when < _nextSendTime) @@ -699,12 +722,12 @@ public class Connection { _nextSendTime = max; } - if (_log.shouldLog(Log.DEBUG) && false) { - if (_nextSendTime <= 0) - _log.debug("set next send time to an unknown time", new Exception(toString())); - else - _log.debug("set next send time to " + (_nextSendTime-_context.clock().now()) + "ms from now", new Exception(toString())); - } + //if (_log.shouldLog(Log.DEBUG) && false) { + // if (_nextSendTime <= 0) + // _log.debug("set next send time to an unknown time", new Exception(toString())); + // else + // _log.debug("set next send time to " + (_nextSendTime-_context.clock().now()) + "ms from now", new Exception(toString())); + //} } /** how many packets have we sent and the other side has ACKed? @@ -742,7 +765,9 @@ public class Connection { public long getCongestionWindowEnd() { return _congestionWindowEnd; } public void setCongestionWindowEnd(long endMsg) { _congestionWindowEnd = endMsg; } + /** @return the highest outbound packet we have recieved an ack for */ public long getHighestAckedThrough() { return _highestAckedThrough; } + /** @deprecated unused */ public void setHighestAckedThrough(long msgNum) { _highestAckedThrough = msgNum; } public long getLastActivityOn() { @@ -835,8 +860,8 @@ public class Connection { } long howLong = _options.getInactivityTimeout(); howLong += _randomWait; // randomize it a bit, so both sides don't do it at once - if (_log.shouldLog(Log.DEBUG)) - _log.debug("Resetting the inactivity timer to " + howLong, new Exception(toString())); + //if (_log.shouldLog(Log.DEBUG)) + // _log.debug("Resetting the inactivity timer to " + howLong); // this will get rescheduled, and rescheduled, and rescheduled... _activityTimer.reschedule(howLong, false); // use the later of current and previous timeout } @@ -1087,6 +1112,8 @@ public class Connection { // we want to resend this packet, but there are already active // resends in the air and we dont want to make a bad situation // worse. wait another second + // BUG? seq# = 0, activeResends = 0, loop forever - why? + // also seen with seq# > 0. Is the _activeResends count reliable? if (_log.shouldLog(Log.INFO)) _log.info("Delaying resend of " + _packet + " as there are " + _activeResends + " active resends already in play"); @@ -1104,6 +1131,7 @@ public class Connection { _packet.setOptionalDelay(choke); if (choke > 0) _packet.setFlag(Packet.FLAG_DELAY_REQUESTED); + // this seems unnecessary to send the MSS again: _packet.setOptionalMaxSize(getOptions().getMaxMessageSize()); // bugfix release 0.7.8, we weren't dividing by 1000 _packet.setResendDelay(getOptions().getResendDelay() / 1000); diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionDataReceiver.java b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionDataReceiver.java index 3b55160d3..acec982f6 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionDataReceiver.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionDataReceiver.java @@ -166,6 +166,7 @@ class ConnectionDataReceiver implements MessageOutputStream.DataReceiver { packet.setReceiveStreamId(con.getReceiveStreamId()); con.getInputStream().updateAcks(packet); + // note that the optional delay is usually rewritten in Connection.sendPacket() int choke = con.getOptions().getChoke(); packet.setOptionalDelay(choke); if (choke > 0) @@ -197,12 +198,9 @@ class ConnectionDataReceiver implements MessageOutputStream.DataReceiver { ( (size > 0) || (con.getUnackedPacketsSent() <= 0) || (packet.getSequenceNum() > 0) ) ) { packet.setFlag(Packet.FLAG_CLOSE); con.setCloseSentOn(_context.clock().now()); - if (_log.shouldLog(Log.DEBUG)) - _log.debug("Closed is set for a new packet on " + con + ": " + packet); - } else { - if (_log.shouldLog(Log.DEBUG)) - _log.debug("Closed is not set for a new packet on " + _connection + ": " + packet); } + if (_log.shouldLog(Log.DEBUG)) + _log.debug("New outbound packet on " + _connection + ": " + packet); return packet; } diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java index bd32afbf7..d8f50fbcf 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java @@ -46,6 +46,7 @@ public class ConnectionOptions extends I2PSocketOptionsImpl { public static final String PROP_INITIAL_RESEND_DELAY = "i2p.streaming.initialResendDelay"; public static final String PROP_INITIAL_ACK_DELAY = "i2p.streaming.initialAckDelay"; public static final String PROP_INITIAL_WINDOW_SIZE = "i2p.streaming.initialWindowSize"; + /** unused */ public static final String PROP_INITIAL_RECEIVE_WINDOW = "i2p.streaming.initialReceiveWindow"; public static final String PROP_INACTIVITY_TIMEOUT = "i2p.streaming.inactivityTimeout"; public static final String PROP_INACTIVITY_ACTION = "i2p.streaming.inactivityAction"; @@ -58,6 +59,7 @@ public class ConnectionOptions extends I2PSocketOptionsImpl { static final int INITIAL_WINDOW_SIZE = 6; static final int DEFAULT_MAX_SENDS = 8; public static final int DEFAULT_INITIAL_RTT = 8*1000; + public static final int DEFAULT_INITIAL_ACK_DELAY = 2*1000; static final int MIN_WINDOW_SIZE = 1; private static final boolean DEFAULT_ANSWER_PINGS = true; @@ -217,7 +219,7 @@ public class ConnectionOptions extends I2PSocketOptionsImpl { setRTT(getInt(opts, PROP_INITIAL_RTT, DEFAULT_INITIAL_RTT)); setReceiveWindow(getInt(opts, PROP_INITIAL_RECEIVE_WINDOW, 1)); setResendDelay(getInt(opts, PROP_INITIAL_RESEND_DELAY, 1000)); - setSendAckDelay(getInt(opts, PROP_INITIAL_ACK_DELAY, 2000)); + setSendAckDelay(getInt(opts, PROP_INITIAL_ACK_DELAY, DEFAULT_INITIAL_ACK_DELAY)); setWindowSize(getInt(opts, PROP_INITIAL_WINDOW_SIZE, INITIAL_WINDOW_SIZE)); setMaxResends(getInt(opts, PROP_MAX_RESENDS, DEFAULT_MAX_SENDS)); setWriteTimeout(getInt(opts, PROP_WRITE_TIMEOUT, -1)); @@ -249,7 +251,7 @@ public class ConnectionOptions extends I2PSocketOptionsImpl { if (opts.containsKey(PROP_INITIAL_RESEND_DELAY)) setResendDelay(getInt(opts, PROP_INITIAL_RESEND_DELAY, 1000)); if (opts.containsKey(PROP_INITIAL_ACK_DELAY)) - setSendAckDelay(getInt(opts, PROP_INITIAL_ACK_DELAY, 2000)); + setSendAckDelay(getInt(opts, PROP_INITIAL_ACK_DELAY, DEFAULT_INITIAL_ACK_DELAY)); if (opts.containsKey(PROP_INITIAL_WINDOW_SIZE)) setWindowSize(getInt(opts, PROP_INITIAL_WINDOW_SIZE, INITIAL_WINDOW_SIZE)); if (opts.containsKey(PROP_MAX_RESENDS)) @@ -295,6 +297,7 @@ public class ConnectionOptions extends I2PSocketOptionsImpl { * @return if we want signatures on all packets. */ public boolean getRequireFullySigned() { return _fullySigned; } + /** unused, see above */ public void setRequireFullySigned(boolean sign) { _fullySigned = sign; } /** @@ -325,7 +328,7 @@ public class ConnectionOptions extends I2PSocketOptionsImpl { } /** after how many consecutive messages should we ack? - * This doesn't appear to be used. + * @deprecated This doesn't appear to be used. * @return receive window size. */ public int getReceiveWindow() { return _receiveWindow; } @@ -405,6 +408,10 @@ public class ConnectionOptions extends I2PSocketOptionsImpl { * @return ACK delay in ms */ public int getSendAckDelay() { return _sendAckDelay; } + /** + * Unused except here, so expect the default initial delay of 2000 ms unless set by the user + * to remain constant. + */ public void setSendAckDelay(int delayMs) { _sendAckDelay = delayMs; } /** What is the largest message we want to send or receive? diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionPacketHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionPacketHandler.java index 91a06e088..ba705b2d5 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionPacketHandler.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionPacketHandler.java @@ -131,11 +131,14 @@ public class ConnectionPacketHandler { isNew = false; } - if ( (packet.getSequenceNum() == 0) && (packet.getPayloadSize() > 0) ) { - if (_log.shouldLog(Log.DEBUG)) - _log.debug("seq=0 && size=" + packet.getPayloadSize() + ": isNew? " + isNew - + " packet: " + packet + " con: " + con); - } + //if ( (packet.getSequenceNum() == 0) && (packet.getPayloadSize() > 0) ) { + // if (_log.shouldLog(Log.DEBUG)) + // _log.debug("seq=0 && size=" + packet.getPayloadSize() + ": isNew? " + isNew + // + " packet: " + packet + " con: " + con); + //} + + if (_log.shouldLog(Log.DEBUG)) + _log.debug((isNew ? "New" : "Dup or ack-only") + " inbound packet on " + con + ": " + packet); // close *after* receiving the data, as well as after verifying the signatures / etc if (packet.isFlagSet(Packet.FLAG_CLOSE) && packet.isFlagSet(Packet.FLAG_SIGNATURE_INCLUDED)) @@ -151,7 +154,9 @@ public class ConnectionPacketHandler { if (packet.isFlagSet(Packet.FLAG_DELAY_REQUESTED) && (packet.getOptionalDelay() <= 0) ) { if (_log.shouldLog(Log.DEBUG)) _log.debug("Scheduling immediate ack for " + packet); - con.setNextSendTime(_context.clock().now() + con.getOptions().getSendAckDelay()); + //con.setNextSendTime(_context.clock().now() + con.getOptions().getSendAckDelay()); + // honor request "almost" immediately + con.setNextSendTime(_context.clock().now() + 250); } else { int delay = con.getOptions().getSendAckDelay(); if (packet.isFlagSet(Packet.FLAG_DELAY_REQUESTED)) // delayed ACK requested @@ -222,6 +227,10 @@ public class ConnectionPacketHandler { // con.fastRetransmit(); } + /** + * Process the acks in a received packet, and adjust our window and RTT + * @return are we congested? + */ private boolean ack(Connection con, long ackThrough, long nacks[], Packet packet, boolean isNew, boolean choke) { if (ackThrough < 0) return false; //if ( (nacks != null) && (nacks.length > 0) ) @@ -287,7 +296,7 @@ public class ConnectionPacketHandler { return adjustWindow(con, isNew, packet.getSequenceNum(), numResends, (acked != null ? acked.size() : 0), choke); } - + /** @return are we congested? */ private boolean adjustWindow(Connection con, boolean isNew, long sequenceNum, int numResends, int acked, boolean choke) { boolean congested = false; if ( (!isNew) && (sequenceNum > 0) ) { diff --git a/apps/streaming/java/src/net/i2p/client/streaming/Packet.java b/apps/streaming/java/src/net/i2p/client/streaming/Packet.java index 85981d9e6..14ebb61d5 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/Packet.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/Packet.java @@ -42,7 +42,7 @@ import net.i2p.util.Log; *
  • {@link #FLAG_MAX_PACKET_SIZE_INCLUDED}: 2 byte integer
    • *
  • {@link #FLAG_PROFILE_INTERACTIVE}: no option data
    • *
  • {@link #FLAG_ECHO}: no option data
    • - *
  • {@link #FLAG_NO_ACK}: no option data
    • + *
  • {@link #FLAG_NO_ACK}: no option data - this appears to be unused, we always ack, even for the first packet
    • * * *

    If the signature is included, it uses the Destination's DSA key From 234c084c2a1f7a5e4cb7dd080d498edc92ecb4f9 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 24 Nov 2009 20:15:29 +0000 Subject: [PATCH 003/127] * OrderedProperties: Vastly implify, use in i2psnark --- .../src/org/klomp/snark/SnarkManager.java | 3 +- .../src/net/i2p/util/OrderedProperties.java | 353 +----------------- 2 files changed, 16 insertions(+), 340 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index d83b54060..2ad0107d6 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -20,6 +20,7 @@ import net.i2p.data.Base64; import net.i2p.data.DataHelper; import net.i2p.util.I2PAppThread; import net.i2p.util.Log; +import net.i2p.util.OrderedProperties; /** * Manage multiple snarks @@ -126,7 +127,7 @@ public class SnarkManager implements Snark.CompleteListener { /** null to set initial defaults */ public void loadConfig(String filename) { if (_config == null) - _config = new Properties(); + _config = new OrderedProperties(); if (filename != null) { File cfg = new File(filename); if (!cfg.isAbsolute()) diff --git a/core/java/src/net/i2p/util/OrderedProperties.java b/core/java/src/net/i2p/util/OrderedProperties.java index 3c10dcb92..731f27a85 100644 --- a/core/java/src/net/i2p/util/OrderedProperties.java +++ b/core/java/src/net/i2p/util/OrderedProperties.java @@ -9,371 +9,46 @@ package net.i2p.util; * */ -import java.io.InputStream; -import java.io.OutputStream; -import java.io.PrintStream; -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Iterator; +import java.util.Comparator; import java.util.Map; import java.util.Properties; import java.util.Set; import java.util.TreeSet; -import net.i2p.data.DataHelper; - /** * Properties map that has its keySet ordered consistently (via the key's lexicographical ordering). * This is useful in environments where maps must stay the same order (e.g. for signature verification) * This does NOT support remove against the iterators / etc. * + * @author zzz Rewritten + * + * Now unsorted until the keyset or entryset is requested. + * The class is unsynchronized. + * The keySet() and entrySet() methods return ordered sets. + * Others - such as the enumerations values(), keys(), propertyNames() - do not. */ public class OrderedProperties extends Properties { - private final static Log _log = new Log(OrderedProperties.class); - /** ordered set of keys (strings) stored in the properties */ - private TreeSet _order; - /** simple key=value mapping of the actual data */ - private Map _data; - - /** lock this before touching _order or _data */ - private final Object _lock = new Object(); public OrderedProperties() { super(); - _order = new TreeSet(); - _data = new HashMap(); - } - - @Override - public boolean contains(Object value) { - return containsValue(value); - } - - @Override - public boolean containsKey(Object key) { - synchronized (_lock) { - return _data.containsKey(key); - } - } - - @Override - public boolean containsValue(Object value) { - synchronized (_lock) { - return _data.containsValue(value); - } - } - - @Override - public boolean equals(Object obj) { - if ((obj != null) && (obj instanceof OrderedProperties)) { - synchronized (_lock) { - return _data.equals(obj); - } - } - - return false; - } - - @Override - public int hashCode() { - synchronized (_lock) { - return _data.hashCode(); - } - } - - @Override - public boolean isEmpty() { - return size() == 0; - } - - @Override - public String getProperty(String key) { - return getProperty((Object) key); - } - - @Override - public Object get(Object key) { - return getProperty(key); - } - - private String getProperty(Object key) { - if (key == null) return null; - synchronized (_lock) { - Object rv = _data.get(key); - if ((rv != null) && (rv instanceof String)) return (String) rv; - - return null; - } - } - - @Override - public Object setProperty(String key, String val) { - if ((key == null) || (val == null)) throw new IllegalArgumentException("Null values are not supported"); - synchronized (_lock) { - _order.add(key); - Object rv = _data.put(key, val); - return rv; - } - } - - @Override - public Object put(Object key, Object val) { - if ((key == null) || (val == null)) throw new NullPointerException("Null values or keys are not allowed"); - if (!(key instanceof String) || !(val instanceof String)) - throw new IllegalArgumentException("Key or value is not a string"); - return setProperty((String) key, (String) val); - } - - @Override - public void putAll(Map data) { - if (data == null) return; - for (Iterator iter = data.entrySet().iterator(); iter.hasNext();) { - Map.Entry entry = (Map.Entry)iter.next(); - Object key = entry.getKey(); - Object val = entry.getValue(); - put(key, val); - } - } - - @Override - public Object clone() { - synchronized (_lock) { - OrderedProperties rv = new OrderedProperties(); - rv.putAll(this); - return rv; - } - } - - @Override - public void clear() { - synchronized (_lock) { - _order.clear(); - _data.clear(); - } - } - - @Override - public int size() { - synchronized (_lock) { - return _order.size(); - } - } - - @Override - public Object remove(Object key) { - synchronized (_lock) { - _order.remove(key); - Object rv = _data.remove(key); - return rv; - } } @Override public Set keySet() { - synchronized (_lock) { - return Collections.unmodifiableSortedSet((TreeSet) _order.clone()); - } + return Collections.unmodifiableSortedSet(new TreeSet(super.keySet())); } @Override public Set entrySet() { - synchronized (_lock) { - return Collections.unmodifiableSet(buildEntrySet((TreeSet) _order.clone())); - } + TreeSet rv = new TreeSet(new EntryComparator()); + rv.addAll(super.entrySet()); + return Collections.unmodifiableSortedSet(rv); } - @Override - public Collection values() { - synchronized (_lock) { - Collection values = new ArrayList(_data.size()); - for (Iterator iter = _data.values().iterator(); iter.hasNext();) { - values.add(iter.next()); - } - return values; - } - } - - @Override - public Enumeration elements() { - return Collections.enumeration(values()); - } - - @Override - public Enumeration keys() { - return Collections.enumeration(keySet()); - } - - @Override - public Enumeration propertyNames() { - return Collections.enumeration(keySet()); - } - - @Override - public void list(PrintStream out) { // nop - } - - @Override - public void list(PrintWriter out) { // nop - } - - @Override - public void load(InputStream in) { // nop - } - - //public void save(OutputStream out, String header) {} - @Override - public void store(OutputStream out, String header) { // nop - } - - private Set buildEntrySet(Set data) { - TreeSet ts = new TreeSet(); - for (Iterator iter = data.iterator(); iter.hasNext();) { - String key = (String) iter.next(); - String val = getProperty(key); - ts.add(new StringMapEntry(key, val)); - } - return ts; - } - - private static class StringMapEntry implements Map.Entry, Comparable { - private Object _key; - private Object _value; - - public StringMapEntry(String key, String val) { - _key = key; - _value = val; - } - - public Object getKey() { - return _key; - } - - public Object getValue() { - return _value; - } - - public Object setValue(Object value) { - Object old = _value; - _value = value; - return old; - } - - public int compareTo(Object o) { - if (o == null) return -1; - if (o instanceof StringMapEntry) return ((String) getKey()).compareTo((String)((StringMapEntry) o).getKey()); - if (o instanceof String) return ((String) getKey()).compareTo((String)o); - return -2; - } - - /* FIXME missing hashCode() method FIXME */ - @Override - public boolean equals(Object o) { - if (o == null) return false; - if (!(o instanceof StringMapEntry)) return false; - StringMapEntry e = (StringMapEntry) o; - return DataHelper.eq(e.getKey(), getKey()) && DataHelper.eq(e.getValue(), getValue()); - } - } - - /// - /// tests - /// - - public static void main(String args[]) { - test(new OrderedProperties()); - _log.debug("After ordered"); - //test(new Properties()); - //System.out.println("After normal"); - test2(); - testThrash(); - } - - private static void test2() { - OrderedProperties p = new OrderedProperties(); - p.setProperty("a", "b"); - p.setProperty("c", "d"); - OrderedProperties p2 = new OrderedProperties(); - try { - p2.putAll(p); - } catch (Throwable t) { - t.printStackTrace(); - } - _log.debug("After test2"); - } - - private static void test(Properties p) { - for (int i = 0; i < 10; i++) - p.setProperty(i + "asdfasdfasdf", "qwerasdfqwer"); - for (Iterator iter = p.keySet().iterator(); iter.hasNext();) { - String key = (String) iter.next(); - String val = p.getProperty(key); - _log.debug("[" + key + "] = [" + val + "]"); - } - p.remove(4 + "asdfasdfasdf"); - _log.debug("After remove"); - for (Iterator iter = p.keySet().iterator(); iter.hasNext();) { - String key = (String) iter.next(); - String val = p.getProperty(key); - _log.debug("[" + key + "] = [" + val + "]"); - } - try { - p.put("nullVal", null); - _log.debug("Null put did NOT fail!"); - } catch (NullPointerException npe) { - _log.debug("Null put failed correctly"); - } - } - - /** - * Set 100 concurrent threads trying to do some operations against a single - * OrderedProperties object a thousand times. Hopefully this will help - * flesh out any synchronization issues. - * - */ - private static void testThrash() { - OrderedProperties prop = new OrderedProperties(); - for (int i = 0; i < 100; i++) - prop.setProperty(i + "", i + " value"); - _log.debug("Thrash properties built"); - for (int i = 0; i < 100; i++) - thrash(prop, i); - } - - private static void thrash(Properties props, int i) { - I2PThread t = new I2PThread(new Thrash(props)); - t.setName("Thrash" + i); - t.start(); - } - - private static class Thrash implements Runnable { - private Properties _props; - - public Thrash(Properties props) { - _props = props; - } - - public void run() { - int numRuns = 1000; - _log.debug("Begin thrashing " + numRuns + " times"); - for (int i = 0; i < numRuns; i++) { - Set keys = _props.keySet(); - //_log.debug("keySet fetched"); - int cur = 0; - for (Iterator iter = keys.iterator(); iter.hasNext();) { - Object o = iter.next(); - Object val = _props.get(o); - //_log.debug("Value " + cur + " fetched"); - cur++; - } - //_log.debug("Values fetched"); - int size = _props.size(); - _log.debug("Size calculated"); - } - _log.debug("Done thrashing " + numRuns + " times"); + private static class EntryComparator implements Comparator { + public int compare(Object l, Object r) { + return ((String)((Map.Entry)l).getKey()).compareTo(((String)((Map.Entry)r).getKey())); } } } From 95e0492b329e3e6aab030b53a94ed19524fca410 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 24 Nov 2009 20:20:30 +0000 Subject: [PATCH 004/127] * Profiles: Record successes in the DB fail rate too, so we can calculate a percentage * profiles.jsp: - Change fail rate from count to percent - Hide standard profiles by default --- .../router/web/ProfileOrganizerRenderer.java | 30 ++++++++++++++----- .../net/i2p/router/web/ProfilesHelper.java | 8 ++++- apps/routerconsole/jsp/profiles.jsp | 1 + .../net/i2p/router/peermanager/DBHistory.java | 4 +++ 4 files changed, 35 insertions(+), 8 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java index 55939897a..5e7ef4b94 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java @@ -32,7 +32,7 @@ class ProfileOrganizerRenderer { _organizer = organizer; _comparator = new ProfileComparator(); } - public void renderStatusHTML(Writer out) throws IOException { + public void renderStatusHTML(Writer out, boolean full) throws IOException { Set peers = _organizer.selectAllPeers(); long now = _context.clock().now(); @@ -40,6 +40,8 @@ class ProfileOrganizerRenderer { TreeSet order = new TreeSet(_comparator); TreeSet integratedPeers = new TreeSet(_comparator); + int older = 0; + int standard = 0; for (Iterator iter = peers.iterator(); iter.hasNext();) { Hash peer = (Hash)iter.next(); if (_organizer.getUs().equals(peer)) continue; @@ -51,7 +53,14 @@ class ProfileOrganizerRenderer { if (info != null && info.getCapabilities().indexOf("f") >= 0) integratedPeers.add(prof); } - if (prof.getLastSendSuccessful() <= hideBefore) continue; + if (prof.getLastSendSuccessful() <= hideBefore) { + older++; + continue; + } + if ((!full) && !_organizer.isHighCapacity(peer)) { + standard++; + continue; + } order.add(prof); } @@ -62,7 +71,10 @@ class ProfileOrganizerRenderer { StringBuilder buf = new StringBuilder(16*1024); buf.append("

    ").append(_("Peer Profiles")).append("

    \n

    "); buf.append(_("Showing {0} recent profiles.", order.size())).append('\n'); - buf.append(_("Hiding {0} older profiles.", peers.size()-order.size())); + if (older > 0) + buf.append(_("Hiding {0} older profiles.", older)).append('\n'); + if (standard > 0) + buf.append("").append(_("Hiding {0} standard profiles.", standard)).append("\n"); buf.append("

    "); buf.append(""); buf.append(""); @@ -169,7 +181,7 @@ class ProfileOrganizerRenderer { } buf.append("
    "); - buf.append("

    ").append(_("Floodfill and Integrated Peers")).append("

    \n"); + buf.append("

    ").append(_("Floodfill and Integrated Peers")).append("

    \n"); buf.append(""); buf.append(""); buf.append(""); @@ -231,6 +243,7 @@ class ProfileOrganizerRenderer { for (int i = 0; i < 6; i++) buf.append("\n"); } buf.append("
    ").append(_("Peer")).append("").append(_(NA)); } + buf.append("
    "); @@ -324,12 +337,15 @@ class ProfileOrganizerRenderer { private String davg (DBHistory dbh, long rate) { RateStat rs = dbh.getFailedLookupRate(); if (rs == null) - return _(NA); + return "0%"; Rate r = rs.getRate(rate); if (r == null) - return _(NA); + return "0%"; long c = r.getCurrentEventCount() + r.getLastEventCount(); - return "" + c; + if (c <= 0) + return "0%"; + double avg = 0.5 + 100 * (r.getCurrentTotalValue() + r.getLastTotalValue()) / c; + return ((int) avg) + "%"; } /** translate a string */ diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ProfilesHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ProfilesHelper.java index ba7a6aa92..3e68c3169 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ProfilesHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ProfilesHelper.java @@ -4,13 +4,19 @@ import java.io.IOException; public class ProfilesHelper extends HelperBase { + private boolean _full; + public ProfilesHelper() {} + public void setFull(String f) { + _full = f != null; + } + /** @return empty string, writes directly to _out */ public String getProfileSummary() { try { ProfileOrganizerRenderer rend = new ProfileOrganizerRenderer(_context.profileOrganizer(), _context); - rend.renderStatusHTML(_out); + rend.renderStatusHTML(_out, _full); } catch (IOException ioe) { ioe.printStackTrace(); } diff --git a/apps/routerconsole/jsp/profiles.jsp b/apps/routerconsole/jsp/profiles.jsp index 035f50b5b..69100e349 100644 --- a/apps/routerconsole/jsp/profiles.jsp +++ b/apps/routerconsole/jsp/profiles.jsp @@ -11,6 +11,7 @@ " /> + " />

    <%=intl._("Banned Peers")%>

    diff --git a/router/java/src/net/i2p/router/peermanager/DBHistory.java b/router/java/src/net/i2p/router/peermanager/DBHistory.java index 38d06a890..a8e084e49 100644 --- a/router/java/src/net/i2p/router/peermanager/DBHistory.java +++ b/router/java/src/net/i2p/router/peermanager/DBHistory.java @@ -114,6 +114,7 @@ public class DBHistory { */ public void lookupSuccessful() { _successfulLookups++; + _failedLookupRate.addData(0, 0); _lastLookupSuccessful = _context.clock().now(); } @@ -132,6 +133,9 @@ public class DBHistory { * */ public void storeSuccessful() { + // Fixme, redefined this to include both lookup and store fails, + // need to fix the javadocs + _failedLookupRate.addData(0, 0); _lastStoreSuccessful = _context.clock().now(); } From 105524d9c07ce67cb9f8a43dc7995171df9e3467 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 24 Nov 2009 20:22:31 +0000 Subject: [PATCH 005/127] remove another 8887 reference --- history.txt | 18 ++++++++++++++++++ .../resources/checklist.txt | 0 installer/resources/readme/readme.html | 2 +- .../java/src/net/i2p/router/RouterVersion.java | 2 +- 4 files changed, 20 insertions(+), 2 deletions(-) rename checklist.txt => installer/resources/checklist.txt (100%) diff --git a/history.txt b/history.txt index 66c39bf3d..c82497128 100644 --- a/history.txt +++ b/history.txt @@ -1,4 +1,22 @@ +2009-11-24 zzz + * DataStructures: Remove unused Logs + * OrderedProperties: Simplify, use in i2psnark + * Profiles: Record successes in the DB fail rate + too, so we can calculate a percentage + * profiles.jsp: + - Change fail rate from count to percent + - Hide standard profiles by default + * Streaming: + - When an "immediate" ack is requested, do it within + 250 ms (was 2000) + - Request immediate acks when < 1/3 of window remains, + or when < 3 packets remain in window, + and every 8 packets (was when < 2 packets in window remain) + - Change requested delay to RTT/2 (was RTO/2) + - Log cleanup and javadoc + 2009-11-21 zzz + * GeoIP: Update to Nov 17 2009 data * Netdb Floodfill rework part 4 of N: - Search closest-to-the-key - Put closest-to-the-key in explore don't-include-list diff --git a/checklist.txt b/installer/resources/checklist.txt similarity index 100% rename from checklist.txt rename to installer/resources/checklist.txt diff --git a/installer/resources/readme/readme.html b/installer/resources/readme/readme.html index fdb3682a9..79b7560ca 100644 --- a/installer/resources/readme/readme.html +++ b/installer/resources/readme/readme.html @@ -73,7 +73,7 @@ up, you can:

    Troubleshooting

    Be patient - I2P may be slow to start the first time as it searches for peers. If, after 30 minutes, your Active: connected/recent count has less than 10 connected - peers, you should open port 8887 on your firewall for better connectivity. If + peers, you should open I2P's port on your firewall for better connectivity. If you cannot see any eepsites at all (even www.i2p2.i2p), be sure your browser proxy is set to 127.0.0.1 port 4444. You may also want to review the information on the I2P website, diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 67b9de3fe..1ca622af5 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 20; + public final static long BUILD = 21; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; From 6371f66677d91b5ee1d1af1934613c1a734d35d2 Mon Sep 17 00:00:00 2001 From: z3d Date: Fri, 27 Nov 2009 12:03:56 +0000 Subject: [PATCH 006/127] Midnight console theme tweaks. --- .../themes/console/midnight/console.css | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/installer/resources/themes/console/midnight/console.css b/installer/resources/themes/console/midnight/console.css index 1c89b49e6..10ac6422b 100644 --- a/installer/resources/themes/console/midnight/console.css +++ b/installer/resources/themes/console/midnight/console.css @@ -47,7 +47,7 @@ div.logo hr { background: #99f; height: 1px; border: 0px solid #99f; - margin: 8px -3px; + margin: 8px -5px; } div.logo a:link, div.logo a:visited { @@ -103,7 +103,7 @@ div.warning hr { background: #fb7; height: 1px; border: 0px solid #fb7; - margin: 10px 0 5px 0; + margin: 10px 0; } div.warning h3 { @@ -114,6 +114,7 @@ div.warning h3 { font-variant: small-caps; text-transform: capitalize; font-size: 12.5pt; + background: none; } /* console error messages */ @@ -220,7 +221,7 @@ div.routersummary table { border: 0; text-align: center !important; margin: -5px 0px -5px 2px; - width: 185px !important; + width: 186px !important; overflow: hidden; font-size: 8pt; padding: 0 -12px; @@ -257,6 +258,7 @@ div.tunnels table{ width: 16px; text-align: right; margin-right: -2px; + padding-right: 0; } div.routersummary form { @@ -564,7 +566,7 @@ h2, h3 { .proxyfooter{ font-size: 7pt; - display: none !important; + display: none !important; } table { @@ -860,4 +862,12 @@ div.graphspanel h3 { table code { font-size: 8.5pt; +} + +table li:last-child{ + margin-bottom: 15px; +} + +table ul { + font-size: 8.5pt; } \ No newline at end of file From ab0a5a06af3c0cbce44efcaed6780357178cc64d Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 27 Nov 2009 13:26:38 +0000 Subject: [PATCH 007/127] add basic no-webapp handler --- .../i2p/router/web/RouterConsoleRunner.java | 22 ++++++++++++++++++- apps/routerconsole/jsp/nowebapp.jsp | 16 ++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 apps/routerconsole/jsp/nowebapp.jsp diff --git a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java index ec2b10c24..bcd1f3cbd 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java @@ -1,5 +1,6 @@ package net.i2p.router.web; +import java.util.ArrayList; import java.io.File; import java.io.FilenameFilter; import java.io.IOException; @@ -20,6 +21,7 @@ import org.mortbay.http.SecurityConstraint; import org.mortbay.http.handler.SecurityHandler; import org.mortbay.jetty.Server; import org.mortbay.jetty.servlet.WebApplicationContext; +import org.mortbay.jetty.servlet.WebApplicationHandler; public class RouterConsoleRunner { private Server _server; @@ -87,6 +89,8 @@ public class RouterConsoleRunner { if (!_webAppsDir.endsWith("/")) _webAppsDir += '/'; + List notStarted = new ArrayList(); + WebApplicationHandler baseHandler = null; try { StringTokenizer tok = new StringTokenizer(_listenHost, " ,"); int boundAddresses = 0; @@ -111,7 +115,8 @@ public class RouterConsoleRunner { File tmpdir = new File(workDir, ROUTERCONSOLE + "-" + _listenPort); tmpdir.mkdir(); wac.setTempDirectory(tmpdir); - wac.addHandler(0, new LocaleWebAppHandler(I2PAppContext.getGlobalContext())); + baseHandler = new LocaleWebAppHandler(I2PAppContext.getGlobalContext()); + wac.addHandler(0, baseHandler); initialize(wac); File dir = new File(_webAppsDir); String fileNames[] = dir.list(WarFilenameFilter.instance()); @@ -132,6 +137,8 @@ public class RouterConsoleRunner { props.setProperty(PREFIX + appName + ENABLED, "true"); rewrite = true; } + } else { + notStarted.add(appName); } } catch (IOException ioe) { System.err.println("Error resolving '" + fileNames[i] + "' in '" + dir); @@ -154,6 +161,19 @@ public class RouterConsoleRunner { "\"::1,\" in the \"clientApp.0.args\" line of the clients.config file.\n" + "Exception: " + me); } + + if (baseHandler != null) { + // map each not-started webapp to the error page + for (int i = 0; i < notStarted.size(); i++) { + try { + baseHandler.mapPathToServlet('/' + notStarted.get(i) + "/*", + "net.i2p.router.web.jsp.nowebapp_jsp"); + } catch (Throwable me) { + System.err.println(me); + } + } + } + try { SysTray tray = SysTray.getInstance(); } catch (Throwable t) { diff --git a/apps/routerconsole/jsp/nowebapp.jsp b/apps/routerconsole/jsp/nowebapp.jsp new file mode 100644 index 000000000..f62ae6b16 --- /dev/null +++ b/apps/routerconsole/jsp/nowebapp.jsp @@ -0,0 +1,16 @@ +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> + +<% + response.setStatus(404, "Not Found"); +%> + +<%@include file="css.jsi" %> +<%=intl.title("WebApp Not Found")%> + +<%@include file="summary.jsi" %> +

    <%=intl._("Web Application Not Running")%>

    +
    +<%=intl._("The requested web application is not running.")%> +<%=intl._("Please visit the config clients page to start it.")%> +
    From ea0747171f69c1ccb0eef9aa328c2da16939f166 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 27 Nov 2009 14:39:53 +0000 Subject: [PATCH 008/127] * NetDb: - Switch from ArrayList to ConcurrentHashSet in KBucketImpl to reduce chance of deadlock; remove periodic shuffling of the bucket, needs to be addressed elsewhere --- .../router/networkdb/kademlia/KBucket.java | 6 +- .../networkdb/kademlia/KBucketImpl.java | 82 +++++++++---------- .../router/networkdb/kademlia/KBucketSet.java | 7 +- .../networkdb/kademlia/PeerSelector.java | 5 +- 4 files changed, 48 insertions(+), 52 deletions(-) diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KBucket.java b/router/java/src/net/i2p/router/networkdb/kademlia/KBucket.java index a329977b4..5c3c7b0e2 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KBucket.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KBucket.java @@ -56,19 +56,19 @@ interface KBucket { * Retrieve all routing table entries stored in the bucket * @return set of Hash structures */ - public Set getEntries(); + public Set getEntries(); /** * Retrieve hashes stored in the bucket, excluding the ones specified * @return set of Hash structures */ - public Set getEntries(Set toIgnoreHashes); + public Set getEntries(Set toIgnoreHashes); public void getEntries(SelectionCollector collector); /** * Fill the bucket with entries * @param entries set of Hash structures */ - public void setEntries(Set entries); + public void setEntries(Set entries); /** * Generate a random key that would go inside this bucket diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java b/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java index 58e6b16c4..2df76e40c 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java @@ -9,24 +9,35 @@ package net.i2p.router.networkdb.kademlia; */ import java.math.BigInteger; -import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.Iterator; -import java.util.List; import java.util.Set; import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.router.RouterContext; +import net.i2p.util.ConcurrentHashSet; import net.i2p.util.Log; import net.i2p.util.RandomSource; class KBucketImpl implements KBucket { private Log _log; - /** set of Hash objects for the peers in the kbucket */ - private final List _entries; + /** + * set of Hash objects for the peers in the kbucketx + * + * jrandom switched from a HashSet to an ArrayList with this change: + * 2005-08-27 jrandom + * * Minor logging and optimization tweaks in the router and SDK + * + * Now we switch back to a ConcurrentHashSet and remove all the + * synchronization, which may or may not be faster than + * a synchronized ArrayList, with checks for existence before + * adding a Hash. But the other benefit is it removes one + * cause of profileMangager/netDb deadlock. + */ + private final Set _entries; /** we center the kbucket set on the given hash, and derive distances from this */ private Hash _local; /** include if any bits equal or higher to this bit (in big endian order) */ @@ -41,7 +52,7 @@ class KBucketImpl implements KBucket { public KBucketImpl(I2PAppContext context, Hash local) { _context = context; _log = context.logManager().getLog(KBucketImpl.class); - _entries = new ArrayList(0); //all but the last 1 or 2 buckets will be empty + _entries = new ConcurrentHashSet(2); //all but the last 1 or 2 buckets will be empty _lastShuffle = context.clock().now(); setLocal(local); } @@ -53,9 +64,7 @@ class KBucketImpl implements KBucket { _end = highOrderBitLimit; } public int getKeyCount() { - synchronized (_entries) { - return _entries.size(); - } + return _entries.size(); } public Hash getLocal() { return _local; } @@ -198,46 +207,35 @@ class KBucketImpl implements KBucket { return true; } - public Set getEntries() { - Set entries = new HashSet(64); - synchronized (_entries) { - for (int i = 0; i < _entries.size(); i++) - entries.add((Hash)_entries.get(i)); - } + public Set getEntries() { + Set entries = new HashSet(_entries); return entries; } - public Set getEntries(Set toIgnoreHashes) { - Set entries = new HashSet(64); - synchronized (_entries) { - for (int i = 0; i < _entries.size(); i++) - entries.add((Hash)_entries.get(i)); - entries.removeAll(toIgnoreHashes); - } + public Set getEntries(Set toIgnoreHashes) { + Set entries = new HashSet(_entries); + entries.removeAll(toIgnoreHashes); return entries; } public void getEntries(SelectionCollector collector) { - synchronized (_entries) { - for (int i = 0; i < _entries.size(); i++) - collector.add((Hash)_entries.get(i)); + Set entries = new HashSet(_entries); + for (Hash h : entries) { + collector.add(h); } } - public void setEntries(Set entries) { - synchronized (_entries) { - _entries.clear(); - for (Iterator iter = entries.iterator(); iter.hasNext(); ) { - Hash entry = (Hash)iter.next(); - if (!_entries.contains(entry)) - _entries.add(entry); - } - } + public void setEntries(Set entries) { + _entries.clear(); + _entries.addAll(entries); } + /** + * Todo: shuffling here is a hack and doesn't work since + * wwe witched back to a HashSet implementation + */ public int add(Hash peer) { - synchronized (_entries) { - if (!_entries.contains(peer)) - _entries.add(peer); + _entries.add(peer); +/********** // Randomize the bucket every once in a while if we are floodfill, so that // exploration will return better results. See FloodfillPeerSelector.add(Hash). if (_lastShuffle + SHUFFLE_DELAY < _context.clock().now() && @@ -245,14 +243,12 @@ class KBucketImpl implements KBucket { Collections.shuffle(_entries, _context.random()); _lastShuffle = _context.clock().now(); } - return _entries.size(); - } +***********/ + return _entries.size(); } public boolean remove(Hash peer) { - synchronized (_entries) { - return _entries.remove(peer); - } + return _entries.remove(peer); } /** @@ -332,9 +328,7 @@ class KBucketImpl implements KBucket { public String toString() { StringBuilder buf = new StringBuilder(1024); buf.append("KBucketImpl: "); - synchronized (_entries) { - buf.append(_entries.toString()).append("\n"); - } + buf.append(_entries.toString()).append("\n"); buf.append("Low bit: ").append(_begin).append(" high bit: ").append(_end).append('\n'); buf.append("Local key: \n"); if ( (_local != null) && (_local.getData() != null) ) diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KBucketSet.java b/router/java/src/net/i2p/router/networkdb/kademlia/KBucketSet.java index c17292bdd..0b8fce229 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KBucketSet.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KBucketSet.java @@ -9,6 +9,7 @@ package net.i2p.router.networkdb.kademlia; */ import java.math.BigInteger; +import java.util.Collections; import java.util.HashSet; import java.util.Set; @@ -88,9 +89,9 @@ class KBucketSet { return removed; } - public Set getAll() { return getAll(new HashSet()); } - public Set getAll(Set toIgnore) { - HashSet all = new HashSet(1024); + public Set getAll() { return getAll(Collections.EMPTY_SET); }; + public Set getAll(Set toIgnore) { + Set all = new HashSet(1024); for (int i = 0; i < _buckets.length; i++) { all.addAll(_buckets[i].getEntries(toIgnore)); } diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/PeerSelector.java b/router/java/src/net/i2p/router/networkdb/kademlia/PeerSelector.java index 918465391..7ce9853ca 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/PeerSelector.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/PeerSelector.java @@ -121,8 +121,9 @@ public class PeerSelector { _matches = 0; } public void add(Hash entry) { - if (_context.profileOrganizer().isFailing(entry)) - return; + // deadlock seen here, and we don't mark profiles failing anymore + //if (_context.profileOrganizer().isFailing(entry)) + // return; if (_toIgnore.contains(entry)) return; RouterInfo info = _context.netDb().lookupRouterInfoLocally(entry); From 8682e7deb579dce4f0a4ebfab5deaaed212bbd10 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 27 Nov 2009 16:29:15 +0000 Subject: [PATCH 009/127] cache the hash of the Hash --- core/java/src/net/i2p/data/Hash.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/java/src/net/i2p/data/Hash.java b/core/java/src/net/i2p/data/Hash.java index a99f5ceb5..10856d0c2 100644 --- a/core/java/src/net/i2p/data/Hash.java +++ b/core/java/src/net/i2p/data/Hash.java @@ -32,6 +32,7 @@ public class Hash extends DataStructureImpl { private volatile String _stringified; private volatile String _base64ed; private /* FIXME final FIXME */ Map _xorCache; + private int _cachedHashCode; public final static int HASH_LENGTH = 32; public final static Hash FAKE_HASH = new Hash(new byte[HASH_LENGTH]); @@ -54,6 +55,7 @@ public class Hash extends DataStructureImpl { _data = data; _stringified = null; _base64ed = null; + _cachedHashCode = calcHashCode(); } /** @@ -133,6 +135,7 @@ public class Hash extends DataStructureImpl { _base64ed = null; int read = read(in, _data); if (read != HASH_LENGTH) throw new DataFormatException("Not enough bytes to read the hash"); + _cachedHashCode = calcHashCode(); } public void writeBytes(OutputStream out) throws DataFormatException, IOException { @@ -150,6 +153,11 @@ public class Hash extends DataStructureImpl { /** a Hash is a hash, so just use the first 4 bytes for speed */ @Override public int hashCode() { + return _cachedHashCode; + } + + /** a Hash is a hash, so just use the first 4 bytes for speed */ + private int calcHashCode() { int rv = 0; if (_data != null) { for (int i = 0; i < 4; i++) From 2db7c2bdd8c4f97ce2fa63bc76df5ce44e381e7d Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 28 Nov 2009 13:38:35 +0000 Subject: [PATCH 010/127] new --- .../naming/EepGetAndAddNamingService.java | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 core/java/src/net/i2p/client/naming/EepGetAndAddNamingService.java diff --git a/core/java/src/net/i2p/client/naming/EepGetAndAddNamingService.java b/core/java/src/net/i2p/client/naming/EepGetAndAddNamingService.java new file mode 100644 index 000000000..cf282f719 --- /dev/null +++ b/core/java/src/net/i2p/client/naming/EepGetAndAddNamingService.java @@ -0,0 +1,69 @@ +/* + * public domain + * with no warranty of any kind, either expressed or implied. + */ +package net.i2p.client.naming; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; + +import net.i2p.I2PAppContext; +import net.i2p.data.Destination; + +/** + * Simple extension to EepGetNamingService to append what we find to hosts.txt, + * so we only have to do an EepGet query once. + * + * Note that there is little protection - there are a lot of validity checks in addressbook that are + * not included here. + * + * MUST be used from MetaNamingService, after HostsTxtNamingService. + * Cannot be used as the only NamingService! Be sure any naming service hosts + * are in hosts.txt. If this isn't after HostsTxtNamingService, you will + * clog up your hosts.txt with duplicate entries. + * + * Sample config to put in configadvanced.jsp (restart required): + * + * i2p.naming.impl=net.i2p.client.naming.MetaNamingService + * i2p.nameservicelist=net.i2p.client.naming.HostsTxtNamingService,net.i2p.client.naming.EepGetAndAddNamingService + * i2p.naming.eepget.list=http://stats.i2p/cgi-bin/hostquery.cgi?a=,http://i2host.i2p/cgi-bin/i2hostquery? + * + * @author zzz + */ +public class EepGetAndAddNamingService extends EepGetNamingService { + + /** default hosts.txt filename */ + private final static String DEFAULT_HOSTS_FILE = "hosts.txt"; + + public EepGetAndAddNamingService(I2PAppContext context) { + super(context); + } + + @Override + public Destination lookup(String hostname) { + Destination rv = super.lookup(hostname); + if (rv != null) { + hostname = hostname.toLowerCase(); + // If it's long, assume it's a key. + if (hostname.length() < 516 && hostname.endsWith(".i2p") && ! hostname.endsWith(".b32.i2p")) { + File f = new File(_context.getRouterDir(), DEFAULT_HOSTS_FILE); + if ( (f.exists()) && (f.canWrite()) ) { + synchronized(this) { + FileOutputStream fos = null; + try { + fos = new FileOutputStream(f, true); + String line = hostname + '=' + rv.toBase64() + System.getProperty("line.separator"); + fos.write(line.getBytes()); + } catch (IOException ioe) { + System.err.println("Error appending: " + ioe); + } finally { + if (fos != null) try { fos.close(); } catch (IOException cioe) {} + } + } + } + } + } + return rv; + } +} From 0642fa80939d9ca5c0972ef65f0defc645caf443 Mon Sep 17 00:00:00 2001 From: sponge Date: Sat, 28 Nov 2009 13:53:34 +0000 Subject: [PATCH 011/127] * Improvement to BOB's TCPio to hopefully lower load average. It seems to be helping a little when stress-tested with Robert. --- apps/BOB/nbproject/private/private.xml | 3 --- apps/BOB/src/net/i2p/BOB/DoCMDS.java | 2 +- apps/BOB/src/net/i2p/BOB/TCPio.java | 8 ++++++-- history.txt | 4 ++++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/apps/BOB/nbproject/private/private.xml b/apps/BOB/nbproject/private/private.xml index 685ecc5a1..c1f155a78 100644 --- a/apps/BOB/nbproject/private/private.xml +++ b/apps/BOB/nbproject/private/private.xml @@ -1,7 +1,4 @@ - - file:/usblv/NetBeansProjects/wi2p.i2p/apps/BOB/src/net/i2p/BOB/BOB.java - diff --git a/apps/BOB/src/net/i2p/BOB/DoCMDS.java b/apps/BOB/src/net/i2p/BOB/DoCMDS.java index 8e4afb143..14c83c4ba 100644 --- a/apps/BOB/src/net/i2p/BOB/DoCMDS.java +++ b/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 = "08", BEXT = ""; + public static final String BMAJ = "00", BMIN = "00", BREV = "09", BEXT = ""; public static final String BOBversion = BMAJ + "." + BMIN + "." + BREV + BEXT; private Socket server; private Properties props; diff --git a/apps/BOB/src/net/i2p/BOB/TCPio.java b/apps/BOB/src/net/i2p/BOB/TCPio.java index d501759ef..5e99637dd 100644 --- a/apps/BOB/src/net/i2p/BOB/TCPio.java +++ b/apps/BOB/src/net/i2p/BOB/TCPio.java @@ -78,16 +78,20 @@ public class TCPio implements Runnable { * --Sponge * * Tested with 128 bytes, and there was no performance gain. + * 8192 bytes did lower load average across many connections. + * Should I raise it higer? The correct thing to do would be to + * override... perhaps use NTCP, but I2P's streaming lib lacks + * anything NTCP compatable. * * --Sponge */ int b; - byte a[] = new byte[1]; + byte a[] = new byte[8192]; try { try { while (lives.get()) { - b = Ain.read(a, 0, 1); + b = Ain.read(a, 0, 8192); if (b > 0) { Aout.write(a, 0, b); } else if (b == 0) { diff --git a/history.txt b/history.txt index c82497128..f70d505c5 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +2009-11-28 sponge + * Improvement to BOB's TCPio to hopefully lower load average. It seems + to be helping a little when stress-tested with Robert. + 2009-11-24 zzz * DataStructures: Remove unused Logs * OrderedProperties: Simplify, use in i2psnark diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 1ca622af5..b9d2a6b01 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 21; + public final static long BUILD = 22; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; From c10ea84adec0397b584b0fd6d3cea955fa9164bc Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 28 Nov 2009 14:37:07 +0000 Subject: [PATCH 012/127] * NamingServices - Move default reverseLookup to base class - Deprecate unused services --- core/java/src/net/i2p/I2PAppContext.java | 2 ++ core/java/src/net/i2p/client/naming/AddressDB.java | 3 +++ .../src/net/i2p/client/naming/AddressDBNamingService.java | 3 +++ core/java/src/net/i2p/client/naming/DummyAddressDB.java | 3 +++ .../java/src/net/i2p/client/naming/DummyNamingService.java | 7 +------ .../src/net/i2p/client/naming/EepGetNamingService.java | 5 ----- core/java/src/net/i2p/client/naming/ExecNamingService.java | 5 ----- .../src/net/i2p/client/naming/FilesystemAddressDB.java | 3 +++ .../src/net/i2p/client/naming/HostsTxtNamingService.java | 1 + core/java/src/net/i2p/client/naming/NamingService.java | 4 +++- core/java/src/net/i2p/client/naming/PetName.java | 2 +- core/java/src/net/i2p/client/naming/PetNameDB.java | 2 +- .../src/net/i2p/client/naming/PetNameNamingService.java | 3 +++ 13 files changed, 24 insertions(+), 19 deletions(-) diff --git a/core/java/src/net/i2p/I2PAppContext.java b/core/java/src/net/i2p/I2PAppContext.java index 86c1dc907..1cdb6b297 100644 --- a/core/java/src/net/i2p/I2PAppContext.java +++ b/core/java/src/net/i2p/I2PAppContext.java @@ -432,12 +432,14 @@ public class I2PAppContext { } } + /** @deprecated unused */ public PetNameDB petnameDb() { if (!_petnameDbInitialized) initializePetnameDb(); return _petnameDb; } + /** @deprecated unused */ private void initializePetnameDb() { synchronized (this) { if (_petnameDb == null) { diff --git a/core/java/src/net/i2p/client/naming/AddressDB.java b/core/java/src/net/i2p/client/naming/AddressDB.java index 29b8cf7cb..c43ada589 100644 --- a/core/java/src/net/i2p/client/naming/AddressDB.java +++ b/core/java/src/net/i2p/client/naming/AddressDB.java @@ -7,6 +7,9 @@ import net.i2p.I2PAppContext; import net.i2p.data.Address; import net.i2p.util.Log; +/** + * @deprecated unused + */ public abstract class AddressDB { private final static Log _log = new Log(NamingService.class); diff --git a/core/java/src/net/i2p/client/naming/AddressDBNamingService.java b/core/java/src/net/i2p/client/naming/AddressDBNamingService.java index 4dc65a10d..928212c89 100644 --- a/core/java/src/net/i2p/client/naming/AddressDBNamingService.java +++ b/core/java/src/net/i2p/client/naming/AddressDBNamingService.java @@ -6,6 +6,9 @@ import net.i2p.I2PAppContext; import net.i2p.data.Address; import net.i2p.data.Destination; +/** + * @deprecated unused + */ public class AddressDBNamingService extends NamingService { private AddressDB _addressdb; diff --git a/core/java/src/net/i2p/client/naming/DummyAddressDB.java b/core/java/src/net/i2p/client/naming/DummyAddressDB.java index d7ee9bac1..e18a2b7ad 100644 --- a/core/java/src/net/i2p/client/naming/DummyAddressDB.java +++ b/core/java/src/net/i2p/client/naming/DummyAddressDB.java @@ -5,6 +5,9 @@ import java.util.Collection; import net.i2p.I2PAppContext; import net.i2p.data.Address; +/** + * @deprecated unused + */ public class DummyAddressDB extends AddressDB { public DummyAddressDB(I2PAppContext context) { diff --git a/core/java/src/net/i2p/client/naming/DummyNamingService.java b/core/java/src/net/i2p/client/naming/DummyNamingService.java index dddd5915b..ff0855c27 100644 --- a/core/java/src/net/i2p/client/naming/DummyNamingService.java +++ b/core/java/src/net/i2p/client/naming/DummyNamingService.java @@ -27,9 +27,4 @@ class DummyNamingService extends NamingService { public Destination lookup(String hostname) { return lookupBase64(hostname); } - - @Override - public String reverseLookup(Destination dest) { - return null; - } -} \ No newline at end of file +} diff --git a/core/java/src/net/i2p/client/naming/EepGetNamingService.java b/core/java/src/net/i2p/client/naming/EepGetNamingService.java index 6ce7ca17b..8ddeaa248 100644 --- a/core/java/src/net/i2p/client/naming/EepGetNamingService.java +++ b/core/java/src/net/i2p/client/naming/EepGetNamingService.java @@ -136,9 +136,4 @@ public class EepGetNamingService extends NamingService { _log.error("Caught from: " + url + hostname); return null; } - - @Override - public String reverseLookup(Destination dest) { - return null; - } } diff --git a/core/java/src/net/i2p/client/naming/ExecNamingService.java b/core/java/src/net/i2p/client/naming/ExecNamingService.java index f014fa0d7..446e907c4 100644 --- a/core/java/src/net/i2p/client/naming/ExecNamingService.java +++ b/core/java/src/net/i2p/client/naming/ExecNamingService.java @@ -126,9 +126,4 @@ public class ExecNamingService extends NamingService { } return null; } - - @Override - public String reverseLookup(Destination dest) { - return null; - } } diff --git a/core/java/src/net/i2p/client/naming/FilesystemAddressDB.java b/core/java/src/net/i2p/client/naming/FilesystemAddressDB.java index cefbf5eea..806b9e90a 100644 --- a/core/java/src/net/i2p/client/naming/FilesystemAddressDB.java +++ b/core/java/src/net/i2p/client/naming/FilesystemAddressDB.java @@ -16,6 +16,9 @@ import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; import net.i2p.util.Log; +/** + * @deprecated unused + */ public class FilesystemAddressDB extends AddressDB { public final static String PROP_ADDRESS_DIR = "i2p.addressdir"; diff --git a/core/java/src/net/i2p/client/naming/HostsTxtNamingService.java b/core/java/src/net/i2p/client/naming/HostsTxtNamingService.java index f89d56d09..ff1b367fd 100644 --- a/core/java/src/net/i2p/client/naming/HostsTxtNamingService.java +++ b/core/java/src/net/i2p/client/naming/HostsTxtNamingService.java @@ -138,6 +138,7 @@ public class HostsTxtNamingService extends NamingService { return null; } + /** @deprecated unused */ @Override public String reverseLookup(Hash h) { List filenames = getFilenames(); diff --git a/core/java/src/net/i2p/client/naming/NamingService.java b/core/java/src/net/i2p/client/naming/NamingService.java index fd6277139..a7098d799 100644 --- a/core/java/src/net/i2p/client/naming/NamingService.java +++ b/core/java/src/net/i2p/client/naming/NamingService.java @@ -61,7 +61,9 @@ public abstract class NamingService { * if none is known. It is safe for subclasses to always return * null if no reverse lookup is possible. */ - public abstract String reverseLookup(Destination dest); + public String reverseLookup(Destination dest) { return null; }; + + /** @deprecated unused */ public String reverseLookup(Hash h) { return null; }; /** diff --git a/core/java/src/net/i2p/client/naming/PetName.java b/core/java/src/net/i2p/client/naming/PetName.java index 38d27b608..cb0df4ab9 100644 --- a/core/java/src/net/i2p/client/naming/PetName.java +++ b/core/java/src/net/i2p/client/naming/PetName.java @@ -7,7 +7,7 @@ import java.util.StringTokenizer; import net.i2p.data.DataHelper; /** - * + * deprecated unused but can be instantiated through I2PAppContext */ public class PetName { private String _name; diff --git a/core/java/src/net/i2p/client/naming/PetNameDB.java b/core/java/src/net/i2p/client/naming/PetNameDB.java index efa96e5d0..cff2ab56c 100644 --- a/core/java/src/net/i2p/client/naming/PetNameDB.java +++ b/core/java/src/net/i2p/client/naming/PetNameDB.java @@ -19,7 +19,7 @@ import java.util.Set; /** - * + * deprecated unused but can be instantiated through I2PAppContext */ public class PetNameDB { /** name (String) to PetName mapping */ diff --git a/core/java/src/net/i2p/client/naming/PetNameNamingService.java b/core/java/src/net/i2p/client/naming/PetNameNamingService.java index ec59249a7..a052315f3 100644 --- a/core/java/src/net/i2p/client/naming/PetNameNamingService.java +++ b/core/java/src/net/i2p/client/naming/PetNameNamingService.java @@ -5,6 +5,9 @@ import java.io.IOException; import net.i2p.I2PAppContext; import net.i2p.data.Destination; +/** + * @deprecated unused + */ public class PetNameNamingService extends NamingService { private PetNameDB _petnameDb; From 4b6989ef7bbbf8472d102a831c63e0d2fade6fd2 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 28 Nov 2009 17:08:02 +0000 Subject: [PATCH 013/127] * Addressbook, susidns: Rework addressbook into a HttpServlet, so susidns can kick it when the subscription list changes --- .../java/src/net/i2p/addressbook/Servlet.java | 47 ++++++++++++++----- apps/addressbook/web.xml | 6 +++ .../src/i2p/susi/dns/SubscriptionsBean.java | 14 +++++- 3 files changed, 54 insertions(+), 13 deletions(-) diff --git a/apps/addressbook/java/src/net/i2p/addressbook/Servlet.java b/apps/addressbook/java/src/net/i2p/addressbook/Servlet.java index 8f26788e4..c5239609e 100644 --- a/apps/addressbook/java/src/net/i2p/addressbook/Servlet.java +++ b/apps/addressbook/java/src/net/i2p/addressbook/Servlet.java @@ -21,24 +21,43 @@ package net.i2p.addressbook; -import javax.servlet.GenericServlet; +import java.util.Random; + import javax.servlet.ServletConfig; import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * A wrapper for addressbook to allow it to be started as a web application. * + * This was a GenericServlet, we make it an HttpServlet solely to provide a hook + * for SusiDNS to wake us up when the subscription list changes. + * * @author Ragnarok * */ -public class Servlet extends GenericServlet { +public class Servlet extends HttpServlet { + private Thread _thread; + private String _nonce; + private static final String PROP_NONCE = "addressbook.nonce"; - /* (non-Javadoc) - * @see javax.servlet.Servlet#service(javax.servlet.ServletRequest, javax.servlet.ServletResponse) + /** + * Hack to allow susidns to kick the daemon when the subscription list changes. + * URL must be /addressbook/ with wakeup param set, and nonce param set from system property. + * + * (non-Javadoc) + * see javax.servlet.Servlet#service(javax.servlet.ServletRequest, javax.servlet.ServletResponse) */ - public void service(ServletRequest request, ServletResponse response) { + public void service(HttpServletRequest request, HttpServletResponse response) { + //System.err.println("Got request nonce = " + request.getParameter("nonce")); + if (_thread != null && request.getParameter("wakeup") != null && + _nonce != null && _nonce.equals(request.getParameter("nonce"))) { + //System.err.println("Sending interrupt"); + _thread.interrupt(); + } + // no output } /* (non-Javadoc) @@ -49,15 +68,19 @@ public class Servlet extends GenericServlet { try { super.init(config); } catch (ServletException exp) { + System.err.println("Addressbook init exception: " + exp); } + _nonce = "" + Math.abs((new Random()).nextLong()); + // put the nonce where susidns can get it + System.setProperty(PROP_NONCE, _nonce); String[] args = new String[1]; args[0] = config.getInitParameter("home"); - DaemonThread thread = new DaemonThread(args); - thread.setDaemon(true); - thread.setName("Addressbook"); - thread.start(); + _thread = new DaemonThread(args); + _thread.setDaemon(true); + _thread.setName("Addressbook"); + _thread.start(); System.out.println("INFO: Starting Addressbook " + Daemon.VERSION); - System.out.println("INFO: config root under " + args[0]); + //System.out.println("INFO: config root under " + args[0]); } } diff --git a/apps/addressbook/web.xml b/apps/addressbook/web.xml index 0c3548c68..c5fe302a6 100644 --- a/apps/addressbook/web.xml +++ b/apps/addressbook/web.xml @@ -13,4 +13,10 @@ 1 + + + addressbook + / + + diff --git a/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java b/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java index 56a42208b..b860e2393 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java @@ -128,7 +128,19 @@ public class SubscriptionsBean if( lastSerial != null && serial != null && serial.compareTo( lastSerial ) == 0 ) { if( action.compareToIgnoreCase( "save") == 0 ) { save(); - message = "Subscriptions saved."; + String nonce = System.getProperty("addressbook.nonce"); + if (nonce != null) { + // Yes this is a hack. + // No it doesn't work on a text-mode browser. + // Fetching from the addressbook servlet + // with the correct parameters will kick off a + // config reload and fetch. + message = "Subscriptions saved, updating addressbook from subscription sources now." + + "\"\""; + } else { + message = "Subscriptions saved."; + } } else if( action.compareToIgnoreCase( "reload") == 0 ) { reload(); From 278b9174942349b4886e984023f7434c67e85854 Mon Sep 17 00:00:00 2001 From: sponge Date: Sun, 29 Nov 2009 15:02:50 +0000 Subject: [PATCH 014/127] net.i2p.router.transport.udp deadwood code cleanup. documented rare NPE in InboundEstablishState.java. --- apps/BOB/nbproject/private/private.xml | 3 +++ history.txt | 4 ++++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- .../router/transport/udp/InboundEstablishState.java | 8 ++++---- .../router/transport/udp/IntroductionManager.java | 6 ++---- .../router/transport/udp/OutboundEstablishState.java | 3 +-- .../transport/udp/OutboundMessageFragments.java | 12 ++++++------ .../router/transport/udp/OutboundMessageState.java | 4 ++-- .../i2p/router/transport/udp/OutboundRefiller.java | 4 ++-- .../net/i2p/router/transport/udp/PacketBuilder.java | 6 ++---- .../net/i2p/router/transport/udp/PacketHandler.java | 3 +-- .../net/i2p/router/transport/udp/PacketPusher.java | 4 ++-- .../src/net/i2p/router/transport/udp/PeerState.java | 7 +++---- .../net/i2p/router/transport/udp/UDPEndpoint.java | 1 - .../src/net/i2p/router/transport/udp/UDPFlooder.java | 6 +++--- .../src/net/i2p/router/transport/udp/UDPPacket.java | 8 ++++---- .../net/i2p/router/transport/udp/UDPReceiver.java | 2 +- .../net/i2p/router/transport/udp/UDPTransport.java | 10 +++------- 18 files changed, 44 insertions(+), 49 deletions(-) diff --git a/apps/BOB/nbproject/private/private.xml b/apps/BOB/nbproject/private/private.xml index c1f155a78..653e554c3 100644 --- a/apps/BOB/nbproject/private/private.xml +++ b/apps/BOB/nbproject/private/private.xml @@ -1,4 +1,7 @@ + + file:/usblv/NetBeansProjects/i2p.i2p/apps/BOB/src/net/i2p/BOB/TCPio.java + diff --git a/history.txt b/history.txt index f70d505c5..79bb5b2a1 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +2009-11-29 sponge + * net.i2p.router.transport.udp deadwood code cleanup. + * documented rare NPE in InboundEstablishState.java. + 2009-11-28 sponge * Improvement to BOB's TCPio to hopefully lower load average. It seems to be helping a little when stress-tested with Robert. diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index b9d2a6b01..7de969bf4 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 22; + public final static long BUILD = 23; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; diff --git a/router/java/src/net/i2p/router/transport/udp/InboundEstablishState.java b/router/java/src/net/i2p/router/transport/udp/InboundEstablishState.java index fab4ce550..46085e3b4 100644 --- a/router/java/src/net/i2p/router/transport/udp/InboundEstablishState.java +++ b/router/java/src/net/i2p/router/transport/udp/InboundEstablishState.java @@ -46,7 +46,7 @@ public class InboundEstablishState { // general status private long _establishBegin; private long _lastReceive; - private long _lastSend; + // private long _lastSend; private long _nextSend; private RemoteHostId _remoteHostId; private int _currentState; @@ -129,6 +129,7 @@ public class InboundEstablishState { public synchronized byte[] getSentY() { if (_sentY == null) + // Rare NPE seen here... _sentY = _keyBuilder.getMyPublicValueBytes(); return _sentY; } @@ -198,7 +199,7 @@ public class InboundEstablishState { /** note that we just sent a SessionCreated packet */ public synchronized void createdPacketSent() { - _lastSend = _context.clock().now(); + // _lastSend = _context.clock().now(); if ( (_currentState == STATE_UNKNOWN) || (_currentState == STATE_REQUEST_RECEIVED) ) _currentState = STATE_CREATED_SENT; } @@ -210,8 +211,7 @@ public class InboundEstablishState { public synchronized void setNextSendTime(long when) { _nextSend = when; } /** RemoteHostId, uniquely identifies an attempt */ - // FIXME Exporting non-public type through public API FIXME - public RemoteHostId getRemoteHostId() { return _remoteHostId; } + RemoteHostId getRemoteHostId() { return _remoteHostId; } public synchronized void receiveSessionConfirmed(UDPPacketReader.SessionConfirmedReader conf) { if (_receivedIdentity == null) diff --git a/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java b/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java index 20db8a066..2e3329a8f 100644 --- a/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java +++ b/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java @@ -157,8 +157,7 @@ public class IntroductionManager { return found; } - /* FIXME Exporting non-public type through public API FIXME */ - public void receiveRelayIntro(RemoteHostId bob, UDPPacketReader reader) { + void receiveRelayIntro(RemoteHostId bob, UDPPacketReader reader) { if (_context.router().isHidden()) return; if (_log.shouldLog(Log.INFO)) @@ -167,8 +166,7 @@ public class IntroductionManager { _transport.send(_builder.buildHolePunch(reader)); } - /* FIXME Exporting non-public type through public API FIXME */ - public void receiveRelayRequest(RemoteHostId alice, UDPPacketReader reader) { + void receiveRelayRequest(RemoteHostId alice, UDPPacketReader reader) { if (_context.router().isHidden()) return; long tag = reader.getRelayRequestReader().readTag(); diff --git a/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java b/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java index 13a9b277f..ece42da7a 100644 --- a/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java +++ b/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java @@ -413,8 +413,7 @@ public class OutboundEstablishState { } /** uniquely identifies an attempt */ - /* FIXME Exporting non-public type through public API FIXME */ - public RemoteHostId getRemoteHostId() { return _remoteHostId; } + RemoteHostId getRemoteHostId() { return _remoteHostId; } /** we have received a real data packet, so we're done establishing */ public synchronized void dataReceived() { diff --git a/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java b/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java index 69f9f7554..f1d10e122 100644 --- a/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java +++ b/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java @@ -26,7 +26,7 @@ public class OutboundMessageFragments { private RouterContext _context; private Log _log; private UDPTransport _transport; - private ActiveThrottle _throttle; // LINT not used ?? + // private ActiveThrottle _throttle; // LINT not used ?? /** peers we are actively sending messages to */ private final List _activePeers; private boolean _alive; @@ -34,8 +34,8 @@ public class OutboundMessageFragments { private int _nextPeer; private PacketBuilder _builder; /** if we can handle more messages explicitly, set this to true */ - private boolean _allowExcess; // LINT not used?? - private volatile long _packetsRetransmitted; // LINT not used?? + // private boolean _allowExcess; // LINT not used?? + // private volatile long _packetsRetransmitted; // LINT not used?? // private static final int MAX_ACTIVE = 64; // not used. // don't send a packet more than 10 times @@ -45,12 +45,12 @@ public class OutboundMessageFragments { _context = ctx; _log = ctx.logManager().getLog(OutboundMessageFragments.class); _transport = transport; - _throttle = throttle; + // _throttle = throttle; _activePeers = new ArrayList(256); _nextPeer = 0; _builder = new PacketBuilder(ctx, transport); _alive = true; - _allowExcess = false; + // _allowExcess = false; _context.statManager().createRateStat("udp.sendVolleyTime", "Long it takes to send a full volley", "udp", UDPTransport.RATES); _context.statManager().createRateStat("udp.sendConfirmTime", "How long it takes to send a message and get the ACK", "udp", UDPTransport.RATES); _context.statManager().createRateStat("udp.sendConfirmFragments", "How many fragments are included in a fully ACKed message", "udp", UDPTransport.RATES); @@ -376,7 +376,7 @@ public class OutboundMessageFragments { if (state.getPushCount() > 1) { int toSend = fragments-sparseCount; peer.messageRetransmitted(toSend); - _packetsRetransmitted += toSend; // lifetime for the transport + // _packetsRetransmitted += toSend; // lifetime for the transport _context.statManager().addRateData("udp.peerPacketsRetransmitted", peer.getPacketsRetransmitted(), peer.getPacketsTransmitted()); _context.statManager().addRateData("udp.packetsRetransmitted", state.getLifetime(), peer.getPacketsTransmitted()); if (_log.shouldLog(Log.INFO)) diff --git a/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java b/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java index 650c17592..f4afa45c6 100644 --- a/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java +++ b/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java @@ -32,7 +32,7 @@ public class OutboundMessageState { private long _nextSendTime; private int _pushCount; private short _maxSends; - private int _nextSendFragment; + // private int _nextSendFragment; public static final int MAX_MSG_SIZE = 32 * 1024; /** is this enough for a high-bandwidth router? */ @@ -45,7 +45,7 @@ public class OutboundMessageState { _log = _context.logManager().getLog(OutboundMessageState.class); _pushCount = 0; _maxSends = 0; - _nextSendFragment = 0; + // _nextSendFragment = 0; } public boolean initialize(OutNetMessage msg) { diff --git a/router/java/src/net/i2p/router/transport/udp/OutboundRefiller.java b/router/java/src/net/i2p/router/transport/udp/OutboundRefiller.java index 457f7668e..1f61b896c 100644 --- a/router/java/src/net/i2p/router/transport/udp/OutboundRefiller.java +++ b/router/java/src/net/i2p/router/transport/udp/OutboundRefiller.java @@ -16,14 +16,14 @@ public class OutboundRefiller implements Runnable { private OutboundMessageFragments _fragments; private MessageQueue _messages; private boolean _alive; - private Object _refillLock; + // private Object _refillLock; public OutboundRefiller(RouterContext ctx, OutboundMessageFragments fragments, MessageQueue messages) { _context = ctx; _log = ctx.logManager().getLog(OutboundRefiller.class); _fragments = fragments; _messages = messages; - _refillLock = this; + // _refillLock = this; _context.statManager().createRateStat("udp.timeToActive", "Message lifetime until it reaches the outbound fragment queue", "udp", UDPTransport.RATES); } diff --git a/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java b/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java index 8b09dab41..5fe177764 100644 --- a/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java +++ b/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java @@ -879,8 +879,7 @@ public class PacketBuilder { */ private static final byte PEER_RELAY_INTRO_FLAG_BYTE = (UDPPacket.PAYLOAD_TYPE_RELAY_INTRO << 4); - /* FIXME Exporting non-public type through public API FIXME */ - public UDPPacket buildRelayIntro(RemoteHostId alice, PeerState charlie, UDPPacketReader.RelayRequestReader request) { + UDPPacket buildRelayIntro(RemoteHostId alice, PeerState charlie, UDPPacketReader.RelayRequestReader request) { UDPPacket packet = UDPPacket.acquire(_context, false); byte data[] = packet.getPacket().getData(); Arrays.fill(data, 0, data.length, (byte)0x0); @@ -930,8 +929,7 @@ public class PacketBuilder { */ private static final byte PEER_RELAY_RESPONSE_FLAG_BYTE = (UDPPacket.PAYLOAD_TYPE_RELAY_RESPONSE << 4); - /* FIXME Exporting non-public type through public API FIXME */ - public UDPPacket buildRelayResponse(RemoteHostId alice, PeerState charlie, long nonce, SessionKey aliceIntroKey) { + UDPPacket buildRelayResponse(RemoteHostId alice, PeerState charlie, long nonce, SessionKey aliceIntroKey) { InetAddress aliceAddr = null; try { aliceAddr = InetAddress.getByAddress(alice.getIP()); diff --git a/router/java/src/net/i2p/router/transport/udp/PacketHandler.java b/router/java/src/net/i2p/router/transport/udp/PacketHandler.java index 053bb14b0..8edcc5def 100644 --- a/router/java/src/net/i2p/router/transport/udp/PacketHandler.java +++ b/router/java/src/net/i2p/router/transport/udp/PacketHandler.java @@ -36,8 +36,7 @@ public class PacketHandler { /** let packets be up to 30s slow */ private static final long GRACE_PERIOD = Router.CLOCK_FUDGE_FACTOR + 30*1000; - /* FIXME Exporting non-public type through public API FIXME */ - public PacketHandler(RouterContext ctx, UDPTransport transport, UDPEndpoint endpoint, EstablishmentManager establisher, InboundMessageFragments inbound, PeerTestManager testManager, IntroductionManager introManager) {// LINT -- Exporting non-public type through public API + PacketHandler(RouterContext ctx, UDPTransport transport, UDPEndpoint endpoint, EstablishmentManager establisher, InboundMessageFragments inbound, PeerTestManager testManager, IntroductionManager introManager) {// LINT -- Exporting non-public type through public API _context = ctx; _log = ctx.logManager().getLog(PacketHandler.class); _transport = transport; diff --git a/router/java/src/net/i2p/router/transport/udp/PacketPusher.java b/router/java/src/net/i2p/router/transport/udp/PacketPusher.java index 8ec9cbb0d..cb31376b4 100644 --- a/router/java/src/net/i2p/router/transport/udp/PacketPusher.java +++ b/router/java/src/net/i2p/router/transport/udp/PacketPusher.java @@ -10,14 +10,14 @@ import net.i2p.util.Log; * */ public class PacketPusher implements Runnable { - private RouterContext _context; + // private RouterContext _context; private Log _log; private OutboundMessageFragments _fragments; private UDPSender _sender; private boolean _alive; public PacketPusher(RouterContext ctx, OutboundMessageFragments fragments, UDPSender sender) { - _context = ctx; + // _context = ctx; _log = ctx.logManager().getLog(PacketPusher.class); _fragments = fragments; _sender = sender; diff --git a/router/java/src/net/i2p/router/transport/udp/PeerState.java b/router/java/src/net/i2p/router/transport/udp/PeerState.java index 275a68b00..050d87d4d 100644 --- a/router/java/src/net/i2p/router/transport/udp/PeerState.java +++ b/router/java/src/net/i2p/router/transport/udp/PeerState.java @@ -72,7 +72,7 @@ public class PeerState { /** how many consecutive messages have we sent and not received an ACK to */ private int _consecutiveFailedSends; /** when did we last have a failed send (beginning of period) */ - private long _lastFailedSendPeriod; + // private long _lastFailedSendPeriod; /** list of messageIds (Long) that we have received but not yet sent */ private final List _currentACKs; /** @@ -805,7 +805,7 @@ public class PeerState { _concurrentMessagesActive = 0; _consecutiveFailedSends = 0; - _lastFailedSendPeriod = -1; + // _lastFailedSendPeriod = -1; if (numSends < 2) { if (_context.random().nextInt(_concurrentMessagesAllowed) <= 0) _concurrentMessagesAllowed++; @@ -1003,8 +1003,7 @@ public class PeerState { return MAX_RTO; } - /* FIXME Exporting non-public type through public API FIXME */ - public RemoteHostId getRemoteHostId() { return _remoteHostId; } + RemoteHostId getRemoteHostId() { return _remoteHostId; } public int add(OutboundMessageState state) { if (_dead) { diff --git a/router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java b/router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java index 26563c210..ac9369d8e 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java @@ -4,7 +4,6 @@ import java.net.DatagramSocket; import java.net.InetAddress; import java.net.SocketException; -import net.i2p.router.CommSystemFacade; import net.i2p.router.RouterContext; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/transport/udp/UDPFlooder.java b/router/java/src/net/i2p/router/transport/udp/UDPFlooder.java index 633b92421..ef091ff53 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPFlooder.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPFlooder.java @@ -9,14 +9,14 @@ import net.i2p.data.i2np.I2NPMessage; import net.i2p.router.OutNetMessage; import net.i2p.router.RouterContext; import net.i2p.util.I2PThread; -import net.i2p.util.Log; +// import net.i2p.util.Log; /** * */ class UDPFlooder implements Runnable { private RouterContext _context; - private Log _log; + // private Log _log; private UDPTransport _transport; private final List _peers; private boolean _alive; @@ -24,7 +24,7 @@ class UDPFlooder implements Runnable { public UDPFlooder(RouterContext ctx, UDPTransport transport) { _context = ctx; - _log = ctx.logManager().getLog(UDPFlooder.class); + // _log = ctx.logManager().getLog(UDPFlooder.class); _transport = transport; _peers = new ArrayList(4); ctx.random().nextBytes(_floodData); diff --git a/router/java/src/net/i2p/router/transport/udp/UDPPacket.java b/router/java/src/net/i2p/router/transport/udp/UDPPacket.java index 11ffbc67e..97e112df3 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPPacket.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPPacket.java @@ -38,7 +38,7 @@ public class UDPPacket { private long _beforeReceiveFragments; private long _afterHandlingTime; private int _validateCount; - private boolean _isInbound; + // private boolean _isInbound; private static final List _packetCache; static { @@ -83,13 +83,14 @@ public class UDPPacket { _ivBuf = new byte[IV_SIZE]; init(ctx, inbound); } + // FIXME optimization, remove the inbound parameter, as it is unused. FIXME private void init(I2PAppContext ctx, boolean inbound) { _context = ctx; //_dataBuf = _dataCache.acquire(); Arrays.fill(_data, (byte)0); //_packet = new DatagramPacket(_data, MAX_PACKET_SIZE); _packet.setData(_data); - _isInbound = inbound; + // _isInbound = inbound; _initializeTime = _context.clock().now(); _markedType = -1; _validateCount = 0; @@ -125,8 +126,7 @@ public class UDPPacket { int getFragmentCount() { return _fragmentCount; } void setFragmentCount(int count) { _fragmentCount = count; } - // FIXME Exporting non-public type through public API FIXME - public RemoteHostId getRemoteHost() { + RemoteHostId getRemoteHost() { if (_remoteHost == null) { long before = System.currentTimeMillis(); InetAddress addr = _packet.getAddress(); diff --git a/router/java/src/net/i2p/router/transport/udp/UDPReceiver.java b/router/java/src/net/i2p/router/transport/udp/UDPReceiver.java index 2a03cb627..c1bd5133a 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPReceiver.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPReceiver.java @@ -28,7 +28,7 @@ public class UDPReceiver { private boolean _keepRunning; private Runner _runner; private UDPTransport _transport; - private static int __id; + // private static int __id; private int _id; public UDPReceiver(RouterContext ctx, UDPTransport transport, DatagramSocket socket, String name) { diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java index a96a4d507..7bc5990b9 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -3,7 +3,6 @@ package net.i2p.router.transport.udp; import java.io.IOException; import java.io.Writer; import java.net.InetAddress; -import java.net.SocketException; import java.net.UnknownHostException; import java.text.DecimalFormat; import java.util.ArrayList; @@ -545,8 +544,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority * get the state for the peer at the given remote host/port, or null * if no state exists */ - /* FIXME Exporting non-public type through public API FIXME */ - public PeerState getPeerState(RemoteHostId hostInfo) { + PeerState getPeerState(RemoteHostId hostInfo) { synchronized (_peersByRemoteHost) { return (PeerState)_peersByRemoteHost.get(hostInfo); } @@ -783,8 +781,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority } } - /* FIXME Exporting non-public type through public API FIXME */ - public boolean isInDropList(RemoteHostId peer) { synchronized (_dropList) { return _dropList.contains(peer); } } + boolean isInDropList(RemoteHostId peer) { synchronized (_dropList) { return _dropList.contains(peer); } } void dropPeer(Hash peer, boolean shouldShitlist, String why) { PeerState state = getPeerState(peer); @@ -2235,8 +2232,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority _testEvent.runTest(); } - /* FIXME Exporting non-public type through public API FIXME */ - public PeerState pickTestPeer(RemoteHostId dontInclude) { + PeerState pickTestPeer(RemoteHostId dontInclude) { List peers = null; synchronized (_peersByIdent) { peers = new ArrayList(_peersByIdent.values()); From d7d058e772aa70230338b356d1407a2745459f06 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 29 Nov 2009 17:58:24 +0000 Subject: [PATCH 015/127] addressbook servlet cleanup --- .../java/src/net/i2p/addressbook/Servlet.java | 31 +++++++++++-------- apps/addressbook/web.xml | 2 +- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/apps/addressbook/java/src/net/i2p/addressbook/Servlet.java b/apps/addressbook/java/src/net/i2p/addressbook/Servlet.java index c5239609e..fceecfe53 100644 --- a/apps/addressbook/java/src/net/i2p/addressbook/Servlet.java +++ b/apps/addressbook/java/src/net/i2p/addressbook/Servlet.java @@ -21,6 +21,8 @@ package net.i2p.addressbook; +import java.io.IOException; +import java.io.PrintWriter; import java.util.Random; import javax.servlet.ServletConfig; @@ -39,8 +41,8 @@ import javax.servlet.http.HttpServletResponse; * */ public class Servlet extends HttpServlet { - private Thread _thread; - private String _nonce; + private Thread thread; + private String nonce; private static final String PROP_NONCE = "addressbook.nonce"; /** @@ -50,14 +52,17 @@ public class Servlet extends HttpServlet { * (non-Javadoc) * see javax.servlet.Servlet#service(javax.servlet.ServletRequest, javax.servlet.ServletResponse) */ - public void service(HttpServletRequest request, HttpServletResponse response) { + public void service(HttpServletRequest request, HttpServletResponse response) throws IOException { //System.err.println("Got request nonce = " + request.getParameter("nonce")); - if (_thread != null && request.getParameter("wakeup") != null && - _nonce != null && _nonce.equals(request.getParameter("nonce"))) { + if (this.thread != null && request.getParameter("wakeup") != null && + this.nonce != null && this.nonce.equals(request.getParameter("nonce"))) { //System.err.println("Sending interrupt"); - _thread.interrupt(); + this.thread.interrupt(); + // no output + } else { + PrintWriter out = response.getWriter(); + out.write("I2P addressbook OK"); } - // no output } /* (non-Javadoc) @@ -70,15 +75,15 @@ public class Servlet extends HttpServlet { } catch (ServletException exp) { System.err.println("Addressbook init exception: " + exp); } - _nonce = "" + Math.abs((new Random()).nextLong()); + this.nonce = "" + Math.abs((new Random()).nextLong()); // put the nonce where susidns can get it - System.setProperty(PROP_NONCE, _nonce); + System.setProperty(PROP_NONCE, this.nonce); String[] args = new String[1]; args[0] = config.getInitParameter("home"); - _thread = new DaemonThread(args); - _thread.setDaemon(true); - _thread.setName("Addressbook"); - _thread.start(); + this.thread = new DaemonThread(args); + this.thread.setDaemon(true); + this.thread.setName("Addressbook"); + this.thread.start(); System.out.println("INFO: Starting Addressbook " + Daemon.VERSION); //System.out.println("INFO: config root under " + args[0]); } diff --git a/apps/addressbook/web.xml b/apps/addressbook/web.xml index c5fe302a6..6dd20ea1b 100644 --- a/apps/addressbook/web.xml +++ b/apps/addressbook/web.xml @@ -16,7 +16,7 @@ addressbook - / + * From 412d641eb6cd1d84c70853711f644cb77ce608c3 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 29 Nov 2009 18:40:20 +0000 Subject: [PATCH 016/127] fix pathspec --- apps/addressbook/web.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/addressbook/web.xml b/apps/addressbook/web.xml index 6dd20ea1b..b791b4ea0 100644 --- a/apps/addressbook/web.xml +++ b/apps/addressbook/web.xml @@ -16,7 +16,7 @@ addressbook - * + /* From f3a88398f2828ce7aeec43c767d8140a3079e6cf Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 29 Nov 2009 18:46:48 +0000 Subject: [PATCH 017/127] Fix the default inbound burst --- .../src/net/i2p/router/transport/FIFOBandwidthRefiller.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java b/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java index b24d79a11..cd246bf2c 100644 --- a/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java +++ b/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java @@ -42,7 +42,7 @@ public class FIFOBandwidthRefiller implements Runnable { * adjusting bandwidth class boundaries. */ public static final int DEFAULT_OUTBOUND_BANDWIDTH = 40; - public static final int DEFAULT_INBOUND_BURST_BANDWIDTH = 80; + public static final int DEFAULT_INBOUND_BURST_BANDWIDTH = 96; public static final int DEFAULT_OUTBOUND_BURST_BANDWIDTH = 40; public static final int DEFAULT_BURST_SECONDS = 60; From 1ca651e803d9e494dc5e10e3c16038a88671e2b1 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 29 Nov 2009 18:47:12 +0000 Subject: [PATCH 018/127] Fix an error message --- .../java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java index be398f770..db37b9e59 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java @@ -55,7 +55,7 @@ public class I2PSOCKSTunnel extends I2PTunnelClientBase { I2PSocket destSock = serv.getDestinationI2PSocket(this); new I2PTunnelRunner(clientSock, destSock, sockLock, null, mySockets); } catch (SOCKSException e) { - _log.error("Error from SOCKS connection: " + e.getMessage()); + _log.error("Error from SOCKS connection", e); closeSocket(s); } } From 64ee1b313be4748e1934a463ee3578c0bd073e40 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 29 Nov 2009 18:47:34 +0000 Subject: [PATCH 019/127] Comment out unused stuff better --- apps/routerconsole/jsp/config.jsp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp index c422e1016..9a9942c79 100644 --- a/apps/routerconsole/jsp/config.jsp +++ b/apps/routerconsole/jsp/config.jsp @@ -32,15 +32,18 @@

    +<% /******** +*********/ %> +<% /******** +*********/ %> \n\t"); out.write(" - - + + - + @@ -162,15 +164,15 @@
    -

    The ${book.book} addressbook is empty.

    +

    <%=intl._("This addressbook is empty.")%>

    -

    Add new destination:

    -Hostname: -Destination:
    +

    <%=intl._("Add new destination")%>:

    +<%=intl._("Hostname")%>: +<%=intl._("Destination")%>:

    diff --git a/apps/susidns/src/jsp/config.jsp b/apps/susidns/src/jsp/config.jsp index 415bec755..4c3cefbdf 100644 --- a/apps/susidns/src/jsp/config.jsp +++ b/apps/susidns/src/jsp/config.jsp @@ -28,12 +28,13 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + -configuration - susidns v${version.version} +<%=intl._("configuration")%> - susidns v${version.version} @@ -43,14 +44,14 @@
    @@ -68,30 +69,58 @@ configuration *
    -

    Hints

    +

    <%=intl._("Hints")%>

      -
    1. All file or directory paths here are relative to the addressbook's working directory, which normally -is located at $I2P/addressbook/.
      2. -
    2. If you want to manually add lines to an addressbook, add them to the private or master addressbooks. The router -addressbook and the published addressbook are overwritten by the addressbook application.
      3. -
    3. Important:When you publish your addressbook, ALL destinations from the master and router addressbooks appear there. -Use the private addressbook for private destinations, these are not published. +
    4. +<%=intl._("File and directory paths here are relative to the addressbook's working directory, which is normally ~/.i2p/addressbook/ (Linux) or %APPDATA%\\I2P\\addressbook\\ (Windows).")%> +
      5. +
    5. +<%=intl._("If you want to manually add lines to an addressbook, add them to the private or master addressbooks.")%> +<%=intl._("The router addressbook and the published addressbook are updated by the addressbook application.")%> +
      6. +
    6. +<%=intl._("When you publish your addressbook, ALL destinations from the master and router addressbooks appear there.")%> +<%=intl._("Use the private addressbook for private destinations, these are not published.")%>
    -

    Options

    +

    <%=intl._("Options")%>

      -
    • subscriptions - file containing the list of subscriptions URLs (no need to change)
      • -
    • update_delay - update interval in hours (no need to change)
      • -
    • published_addressbook - your public hosts.txt file (choose a path within your webserver document root)
      • -
    • router_addressbook - your hosts.txt (don't change)
      • -
    • master_addressbook - your personal addressbook, it never gets overwritten by the addressbook (don't change)
      • -
    • private_addressbook - your private addressbook, it is never published (defaults to ../privatehosts.txt, don't change)
      • -
    • proxy_port - http port for your eepProxy (no need to change)
      • -
    • proxy_host - hostname for your eepProxy (no need to change)
      • -
    • should_publish - true/false whether to write the published addressbook
      • -
    • etags - file containing the etags header from the fetched subscription URLs (no need to change)
      • -
    • last_modified - file containing the modification timestamp for each fetched subscription URL (no need to change)
      • -
    • log - file to log activity to (change to /dev/null if you like)
      • +
    • subscriptions - +<%=intl._("File containing the list of subscriptions URLs (no need to change)")%> +
      • +
    • update_delay - +<%=intl._("Update interval in hours")%> +
      • +
    • published_addressbook - +<%=intl._("Your public hosts.txt file (choose a path within your webserver document root)")%> +
      • +
    • router_addressbook - +<%=intl._("Your hosts.txt (don't change)")%> +
      • +
    • master_addressbook - +<%=intl._("Your personal addressbook, these hosts will be published")%> +
      • +
    • private_addressbook - +<%=intl._("Your private addressbook, it is never published")%> +
      • +
    • proxy_port - +<%=intl._("Port for your eepProxy (no need to change)")%> +
      • +
    • proxy_host - +<%=intl._("Hostname for your eepProxy (no need to change)")%> +
      • +
    • should_publish - +<%=intl._("Whether to update the published addressbook")%> +
      • +
    • etags - +<%=intl._("File containing the etags header from the fetched subscription URLs (no need to change)")%> +
      • +
    • last_modified - +<%=intl._("File containing the modification timestamp for each fetched subscription URL (no need to change)")%> +
      • +
    • log - +<%=intl._("File to log activity to (change to /dev/null if you like)")%> +
    -

    Huh? what addressbook?

    +

    <%=intl._("What is the addressbook?")%>

    -The addressbook application is part of your i2p installation. It regularly updates your hosts.txt file -from distributed sources. It keeps your hosts.txt up to date, so it can automatically add -eepsites announced on other sites if you subscribe to those sites' addressbooks. +<%=intl._("The addressbook application is part of your i2p installation.")%> +<%=intl._("It regularly updates your hosts.txt file from distributed sources or \"subscriptions\".")%>

    -(To speak the truth: In its default configuration the addressbook does not poll -additional sites, but www.i2p2.i2p only. Subscribing to additional sites is an easy task, -just add them to your subscriptions file.) +<%=intl._("In the default configuration, the addressbook is only subscribed to www.i2p2.i2p.")%> +<%=intl._("Subscribing to additional sites is easy, just add them to your subscriptions file.")%>

    -

    If you have questions about naming in i2p, there is an excellent introduction -from duck in the forum and additional information on www.i2p2.i2p.

    -

    How does the addressbook work?

    -

    The addressbook application regularly (normally once per hour) polls your subscriptions and merges their content -into your so-called router addressbook (normally your plain hosts.txt). Then it merges your so-called master addressbook (normally -your userhosts.txt) into the router addressbook as well. If configured, the router addressbook is now written to the published addressbook, -which is a publicly available copy of your hosts.txt somewhere in your eepsite's document root. +

    +<%=intl._("For more information on naming in i2p, see the overview on www.i2p2.i2p.")%> +

    +

    <%=intl._("How does the addressbook work?")%>

    +

    +<%=intl._("The addressbook application regularly polls your subscriptions and merges their content into your \"router\" addressbook, stored in the hosts.txt file.")%> +<%=intl._("Then it merges your \"master\" addressbook (userhosts.txt) into the router addressbook as well.")%> +<%=intl._("If configured, the router addressbook is now written to the \"published\" addressbook, which will be publicly available if you are running an eepsite.")%>

    -The router also uses a private addressbook (privatehosts.txt, not shown in the picture), which is not merged or published. -Hosts in the private addressbook can be accessed by you but their addresses are never distributed to others. -The private addressbook can also be used for aliases of hosts in your other addressbooks. +<%=intl._("The router also uses a private addressbook (privatehosts.txt, not shown in the picture), which is not merged or published.")%> +<%=intl._("Hosts in the private addressbook can be accessed by you but their addresses are never distributed to others.")%> +<%=intl._("The private addressbook can also be used for aliases of hosts in your other addressbooks.")%>

    addressbook working scheme

    diff --git a/apps/susidns/src/jsp/subscriptions.jsp b/apps/susidns/src/jsp/subscriptions.jsp index a60710310..7485e10bc 100644 --- a/apps/susidns/src/jsp/subscriptions.jsp +++ b/apps/susidns/src/jsp/subscriptions.jsp @@ -28,12 +28,13 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> + -subscriptions - susidns v${version.version} +<%=intl._("subscriptions")%> - susidns v${version.version} @@ -42,14 +43,15 @@ susidns logo
    @@ -67,13 +69,13 @@ subscriptions *
    -

    Explanation

    -The subscription file contains a list of (i2p) URLs. The addressbook application -regularly (once per hour) checks this list for new eepsites. Those URLs simply contain the published hosts.txt -file of other people. The default subscription is the hosts.txt from www.i2p2.i2p, which is updated infrequently. -So it is a good idea to add additional subscriptions to sites that have the latest addresses. -See the FAQ for a list of subscription URLs. +<%=intl._("The subscription file contains a list of i2p URLs.")%> +<%=intl._("The addressbook application regularly checks this list for new eepsites.")%> +<%=intl._("Those URLs refer to published hosts.txt files.")%> +<%=intl._("The default subscription is the hosts.txt from www.i2p2.i2p, which is updated infrequently.")%> +<%=intl._("So it is a good idea to add additional subscriptions to sites that have the latest addresses.")%> +<%=intl._("See the FAQ for a list of subscription URLs.")%>

    " /> <%=intl._("KBps In")%> ()
    " /> <%=intl._("KBps Out")%> ()
    <%=intl._("Share")%> () @@ -121,6 +125,7 @@

    <%=intl._("UDP Configuration:")%>
    <%=intl._("UDP port:")%> " />
    +<% /******** +*********/ %>

    <%=intl._("TCP Configuration")%>:
    <%=intl._("Externally reachable hostname or IP address")%>:
    @@ -163,10 +169,12 @@ <%=intl._("Most of the options above are for special situations, for example where UPnP does not work correctly, or a firewall not under your control is doing harm.")%> <%=intl._("Certain firewalls such as symmetric NATs may not work well with I2P.")%>

    +<% /******** +*********/ %>

    <%=intl._("UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect the external IP address and forward ports.")%> <%=intl._("UPnP support is beta, and may not work for any number of reasons")%>: From f95b5324e0fc57bf6c72d320b36be5fbf423f352 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 29 Nov 2009 18:48:03 +0000 Subject: [PATCH 020/127] profiles.jsp: Hide non-ff from ff table --- .../src/net/i2p/router/web/ProfileOrganizerRenderer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java index 5e7ef4b94..14863acf3 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java @@ -46,13 +46,13 @@ class ProfileOrganizerRenderer { Hash peer = (Hash)iter.next(); if (_organizer.getUs().equals(peer)) continue; PeerProfile prof = _organizer.getProfile(peer); - if (_organizer.isWellIntegrated(peer)) { - integratedPeers.add(prof); - } else { + //if (_organizer.isWellIntegrated(peer)) { + // integratedPeers.add(prof); + //} else { RouterInfo info = _context.netDb().lookupRouterInfoLocally(peer); if (info != null && info.getCapabilities().indexOf("f") >= 0) integratedPeers.add(prof); - } + //} if (prof.getLastSendSuccessful() <= hideBefore) { older++; continue; From 4c812c7bffd5c96662b3d2620bea005b1eec6ded Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 29 Nov 2009 18:49:28 +0000 Subject: [PATCH 021/127] * HTTP Proxy: Don't send proxy.i2p to the naming service, it was making the error pages load slowly --- .../i2p/i2ptunnel/I2PTunnelHTTPClient.java | 28 ++++++++++++------- history.txt | 8 ++++++ .../src/net/i2p/router/RouterVersion.java | 2 +- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java index b729b659b..ce62a23f0 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java @@ -245,6 +245,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable OutputStream out = null; String targetRequest = null; boolean usingWWWProxy = false; + boolean usingInternalServer = false; String currentProxy = null; long requestId = ++__requestId; try { @@ -271,6 +272,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable int pos = line.indexOf(" "); if (pos == -1) break; method = line.substring(0, pos); + // TODO use Java URL class to make all this simpler and more robust String request = line.substring(pos + 1); if (request.startsWith("/") && getTunnel().getClientOptions().getProperty("i2ptunnel.noproxy") != null) { request = "http://i2p" + request; @@ -316,8 +318,11 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable } } - // Quick hack for foo.bar.i2p - if (host.toLowerCase().endsWith(".i2p")) { + if (host.toLowerCase().equals("proxy.i2p")) { + // so we don't do any naming service lookups + destination = "proxy.i2p"; + usingInternalServer = true; + } else if (host.toLowerCase().endsWith(".i2p")) { // Destination gets the host name destination = host; // Host becomes the destination key @@ -454,15 +459,15 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable } destination = request.substring(0, pos); line = method + " " + request.substring(pos); - } + } // end host name processing - boolean isValid = usingWWWProxy || isSupportedAddress(host, protocol); + boolean isValid = usingWWWProxy || usingInternalServer || isSupportedAddress(host, protocol); if (!isValid) { if (_log.shouldLog(Log.INFO)) _log.info(getPrefix(requestId) + "notValid(" + host + ")"); method = null; destination = null; break; - } else if (!usingWWWProxy) { + } else if ((!usingWWWProxy) && (!usingInternalServer)) { if (_log.shouldLog(Log.INFO)) _log.info(getPrefix(requestId) + "host=getHostName(" + destination + ")"); host = getHostName(destination); // hide original host } @@ -473,7 +478,9 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable _log.debug(getPrefix(requestId) + "HOST :" + host + ":"); _log.debug(getPrefix(requestId) + "DEST :" + destination + ":"); } - + + // end first line processing + } else { if (lowercaseLine.startsWith("host: ") && !usingWWWProxy) { line = "Host: " + host; @@ -505,14 +512,14 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable continue; // completely strip the line } } - + if (line.length() == 0) { String ok = getTunnel().getClientOptions().getProperty("i2ptunnel.gzip"); boolean gzip = DEFAULT_GZIP; if (ok != null) gzip = Boolean.valueOf(ok).booleanValue(); - if (gzip) { + if (gzip && !usingInternalServer) { // according to rfc2616 s14.3, this *should* force identity, even if // an explicit q=0 for gzip doesn't. tested against orion.i2p, and it // seems to work. @@ -526,7 +533,8 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable } else { newRequest.append(line).append("\r\n"); // HTTP spec } - } + } // end header processing + if (_log.shouldLog(Log.DEBUG)) _log.debug(getPrefix(requestId) + "NewRequest header: [" + newRequest.toString() + "]"); @@ -548,7 +556,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable // Serve local proxy files (images, css linked from error pages) // Ignore all the headers - if (destination.equals("proxy.i2p")) { + if (usingInternalServer) { serveLocalFile(out, method, targetRequest); s.close(); return; diff --git a/history.txt b/history.txt index 79bb5b2a1..62af66cba 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,11 @@ +2009-11-29 zzz + * config.jsp: Comment out unused stuff better + * profiles.jsp: Hide non-ff from ff table + * HTTP Proxy: Don't send proxy.i2p to the naming service, + it was making the error pages load slowly + * SOCKS Proxy: Fix an error message + * Transport: Fix the default inbound burst + 2009-11-29 sponge * net.i2p.router.transport.udp deadwood code cleanup. * documented rare NPE in InboundEstablishState.java. diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 7de969bf4..458d45df4 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 23; + public final static long BUILD = 24; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; From 454b2c8941f23fe7651c9a847f9412911a7f41c9 Mon Sep 17 00:00:00 2001 From: neutron Date: Mon, 30 Nov 2009 20:46:23 +0000 Subject: [PATCH 022/127] An updated (yet incomplete) version of messages_fr.po --- apps/routerconsole/locale/messages_fr.po | 477 ++++++++++++----------- 1 file changed, 239 insertions(+), 238 deletions(-) diff --git a/apps/routerconsole/locale/messages_fr.po b/apps/routerconsole/locale/messages_fr.po index 828345de9..30b2c3cac 100644 --- a/apps/routerconsole/locale/messages_fr.po +++ b/apps/routerconsole/locale/messages_fr.po @@ -9,17 +9,18 @@ msgstr "" "Project-Id-Version: I2P routerconsole\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-11-01 02:59+0000\n" -"PO-Revision-Date: 2009-11-16 22:31+0100\n" +"PO-Revision-Date: 2009-11-30 21:35+0100\n" "Last-Translator: \n" "Language-Team: foo \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: German\n" +"X-Poedit-Basepath: /home/lee/work/i2p/monotone/i2p.i2p/apps/routerconsole/java\n" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:106 msgid "config networking" -msgstr "" +msgstr "Interconnexion configuration" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:217 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:218 @@ -48,7 +49,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:236 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:216 msgid "Refresh (s)" -msgstr "" +msgstr "Actualiser (s)" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:221 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:222 @@ -77,15 +78,15 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:239 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:220 msgid "Enable" -msgstr "" +msgstr "Activer" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:241 msgid "I2P Network Configuration" -msgstr "" +msgstr "Configuration I2P réseau" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:297 msgid "Bandwidth limiter" -msgstr "" +msgstr "Limiteur de bande passante" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:299 msgid "I2P will work best if you configure your rates to match the speed of your internet connection." @@ -112,7 +113,7 @@ msgstr "NOTER" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:332 #, java-format msgid "You have configured I2P to share only {0} KBps." -msgstr "" +msgstr "Vous avez configuré I2P à partager que {0} KOps." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:335 msgid "I2P requires at least 12KBps to enable sharing. " @@ -129,7 +130,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:340 #, java-format msgid "You have configured I2P to share {0} KBps." -msgstr "" +msgstr "Vous avez configuré I2P à partager {0} KOps." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:343 msgid "The higher the share bandwidth the more you improve your anonymity and help the network." @@ -168,11 +169,11 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:357 msgid "There is help below." -msgstr "" +msgstr "Voir les explications ci-dessous." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:359 msgid "UPnP Configuration" -msgstr "" +msgstr "Configuration UPnP" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:363 msgid "Enable UPnP to open firewall ports" @@ -180,11 +181,11 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:365 msgid "UPnP status" -msgstr "" +msgstr "Statut UPnP" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:367 msgid "IP Configuration" -msgstr "" +msgstr "Configuration IP" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:369 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:425 @@ -210,11 +211,11 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:389 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:443 msgid "Specify hostname or IP" -msgstr "" +msgstr "Stipuler l'adresse IP ou le nom de l'hôte" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:395 msgid "Select Interface" -msgstr "" +msgstr "Choisir l'interface" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:395 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:336 @@ -224,7 +225,7 @@ msgstr "ou" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:409 msgid "Hidden mode - do not publish IP" -msgstr "" +msgstr "Mode caché - ne pas publier l'adresse IP" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:411 msgid "(prevents participating traffic)" @@ -232,15 +233,15 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:413 msgid "UDP Configuration:" -msgstr "" +msgstr "Configuration UDP :" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:415 msgid "UDP port:" -msgstr "" +msgstr "Port UDP :" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:423 msgid "TCP Configuration" -msgstr "" +msgstr "Configuration TCP" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:429 msgid "Use auto-detected IP address" @@ -253,7 +254,7 @@ msgstr "actuellement" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:435 msgid "if we are not firewalled" -msgstr "" +msgstr "s'il n'y a pas de pare-feu" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:439 msgid "Always use auto-detected IP address (Not firewalled)" @@ -281,7 +282,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:469 msgid "Specify Port" -msgstr "" +msgstr "Stipuler le port" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:473 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:342 @@ -291,11 +292,11 @@ msgstr "Noter" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:476 msgid "Changing these settings will restart your router." -msgstr "" +msgstr "Un changement de cette configuration entraînera un redémarrage du routeur" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:482 msgid "Configuration Help" -msgstr "" +msgstr "Aide avec la configuration" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:484 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:526 @@ -364,7 +365,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:516 msgid "They are not private." -msgstr "" +msgstr "Ils ne sont pas privés." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:518 msgid "Also, do not enter a private IP address like 127.0.0.1 or 192.168.1.1." @@ -402,7 +403,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:538 #: src/net/i2p/router/web/SummaryHelper.java:114 msgid "Firewalled" -msgstr "" +msgstr "Bloqué par un pare-feu" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:540 msgid "Your UDP port appears to be firewalled." @@ -435,7 +436,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:554 #: src/net/i2p/router/web/SummaryHelper.java:127 msgid "Testing" -msgstr "" +msgstr "Test en cours" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:556 msgid "The router is currently testing whether your UDP port is firewalled." @@ -445,7 +446,7 @@ msgstr "" #: src/net/i2p/router/web/NetDbRenderer.java:234 #: src/net/i2p/router/web/SummaryHelper.java:96 msgid "Hidden" -msgstr "" +msgstr "Caché" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:560 msgid "The router is not configured to publish its address, therefore it does not expect incoming connections." @@ -509,7 +510,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:590 msgid "ERR - Clock Skew" -msgstr "" +msgstr "ERR - horloge décalé" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:592 msgid "Your system's clock is skewed, which will make it difficult to participate in the network." @@ -597,11 +598,11 @@ msgstr "configuration avancé" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:242 msgid "I2P Advanced Configuration" -msgstr "" +msgstr "Configuration I2P avancé" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:299 msgid "Advanced I2P Configuration" -msgstr "" +msgstr "Configuration I2P avancé" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:303 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:321 @@ -614,15 +615,15 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:106 msgid "config clients" -msgstr "" +msgstr "Clients configuration" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:241 msgid "I2P Client Configuration" -msgstr "" +msgstr "Client I2P configuration" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:306 msgid "Client Configuration" -msgstr "" +msgstr "Configuration Client" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:308 msgid "The Java clients listed below are started by the router and run in the same JVM." @@ -640,11 +641,11 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:321 #: src/net/i2p/router/web/ConfigClientsHandler.java:32 msgid "Save Client Configuration" -msgstr "" +msgstr "Sauvegarder Configuration Client " #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:323 msgid "WebApp Configuration" -msgstr "" +msgstr "Configuration WebApp" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:325 msgid "The Java web applications listed below are started by the webConsole client and run in the same JVM as the router. They are usually web applications accessible through the router console. They may be complete applications (e.g. i2psnark),front-ends to another client or application which must be separately enabled (e.g. susidns, i2ptunnel), or have no web interface at all (e.g. addressbook)." @@ -661,16 +662,16 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:106 msgid "config keyring" -msgstr "" +msgstr "Configuration porte-clés" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:228 msgid "I2P Keyring Configuration" -msgstr "" +msgstr "Configuration du Porte-clés I2P" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:292 #: src/net/i2p/router/web/ConfigNavHelper.java:19 msgid "Keyring" -msgstr "" +msgstr "Porte-clés" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:294 msgid "The router keyring is used to decrypt encrypted leaseSets." @@ -698,11 +699,11 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:316 msgid "Dest. name, hash, or full key" -msgstr "" +msgstr "Nom de destination, empreinte, ou clé complète" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:318 msgid "Encryption Key" -msgstr "" +msgstr "Clé d'encryption" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:320 #: src/net/i2p/router/web/ConfigKeyringHandler.java:18 @@ -716,7 +717,7 @@ msgstr "Supprimer une clé" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:107 msgid "config logging" -msgstr "" +msgstr "configuration enregistrements" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:242 msgid "I2P Logging Configuration" @@ -740,7 +741,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:311 msgid "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)" -msgstr "" +msgstr "(use 'd' = date, 'c' = classe, 't' = fil d'exécution, 'p' = priorité, 'm' = message)" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:313 msgid "Log date format" @@ -748,7 +749,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:317 msgid "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' = millisecond)" -msgstr "" +msgstr "('MM' = mois, 'dd' = jour, 'HH' = heure, 'mm' = minute, 'ss' = seconde, 'SSS' = milliseconde)" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:319 msgid "Max log file size" @@ -768,11 +769,11 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:106 msgid "config peers" -msgstr "" +msgstr "Configuration des pairs" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:228 msgid "I2P Peer Configuration" -msgstr "" +msgstr "Configuration des pairs I2P" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:304 msgid "Manual Peer Controls" @@ -780,7 +781,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:306 msgid "Router Hash" -msgstr "" +msgstr "Routeur empreinte" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:310 msgid "Manually Ban / Unban a Peer" @@ -793,7 +794,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:314 #: src/net/i2p/router/web/ConfigPeerHandler.java:20 msgid "Ban peer until restart" -msgstr "" +msgstr "Interdire pair jusqu'au redémarrage" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:316 #: src/net/i2p/router/web/ConfigPeerHandler.java:28 @@ -811,7 +812,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:326 msgid "profiles page" -msgstr "" +msgstr "page des profiles" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:334 #: src/net/i2p/router/web/ProfileOrganizerRenderer.java:71 @@ -832,23 +833,23 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:344 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:249 msgid "Banned Peers" -msgstr "" +msgstr "Pairs interdits" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:366 msgid "Banned IPs" -msgstr "" +msgstr "Adresses IP interdits" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:106 msgid "config service" -msgstr "" +msgstr "Service Configuration " #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:228 msgid "I2P Service Configuration" -msgstr "" +msgstr "Service I2P Configuration" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:284 msgid "Shutdown the router" -msgstr "" +msgstr "Fermer le routeur" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:286 msgid "Graceful shutdown lets the router satisfy the agreements it has already made before shutting down, but may take a few minutes." @@ -861,18 +862,18 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:290 #: src/net/i2p/router/web/ConfigServiceHandler.java:53 msgid "Shutdown gracefully" -msgstr "" +msgstr "Fermer gracieusement" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:292 #: src/net/i2p/router/web/ConfigRestartBean.java:32 #: src/net/i2p/router/web/ConfigServiceHandler.java:57 msgid "Shutdown immediately" -msgstr "" +msgstr "Fermer immédiatement" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:294 #: src/net/i2p/router/web/ConfigServiceHandler.java:61 msgid "Cancel graceful shutdown" -msgstr "" +msgstr "Annuler fermeture gracieux" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:298 msgid "If you want the router to restart itself after shutting down, you can choose one of the following." @@ -897,12 +898,12 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:308 #: src/net/i2p/router/web/ConfigServiceHandler.java:64 msgid "Graceful restart" -msgstr "" +msgstr "Redémarrage gracieux" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:310 #: src/net/i2p/router/web/ConfigServiceHandler.java:68 msgid "Hard restart" -msgstr "" +msgstr "Redémarrage immédiate" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:316 msgid "Systray integration" @@ -932,7 +933,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:328 msgid "Run on startup" -msgstr "" +msgstr "Lancer avec le démarrage du routeur" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:330 msgid "You can control whether I2P is run on startup or not by selecting one of the following options" @@ -949,12 +950,12 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:338 #: src/net/i2p/router/web/ConfigServiceHandler.java:80 msgid "Run I2P on startup" -msgstr "" +msgstr "Lancer I2P au démarrage" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:340 #: src/net/i2p/router/web/ConfigServiceHandler.java:82 msgid "Don't run I2P on startup" -msgstr "" +msgstr "Ne pas lancer I2P au démarrage" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:344 msgid "If you are running I2P as service right now, removing it will shut down your router immediately." @@ -966,16 +967,16 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:354 msgid "Debugging" -msgstr "" +msgstr "Débogage" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:356 #: src/net/i2p/router/web/ConfigServiceHandler.java:84 msgid "Dump threads" -msgstr "" +msgstr "Dump fils d'exécution" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:360 msgid "Launch browser on router startup?" -msgstr "" +msgstr "Lancer explorateur internet pendant le démarrage du routeur ?" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:362 msgid "I2P's main configuration interface is this web console, so for your convenience I2P can launch a web browser on startup pointing at" @@ -984,12 +985,12 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:364 #: src/net/i2p/router/web/ConfigServiceHandler.java:115 msgid "View console on startup" -msgstr "" +msgstr "Montrer la console au démarrage" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:366 #: src/net/i2p/router/web/ConfigServiceHandler.java:118 msgid "Do not view console on startup" -msgstr "" +msgstr "Ne pas montrer la console au démarrage" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:107 msgid "config stats" @@ -997,7 +998,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:229 msgid "I2P Stats Configuration" -msgstr "" +msgstr "Configuration I2P Statistiques" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:300 msgid "Configure I2P Stat Collection" @@ -1022,15 +1023,15 @@ msgstr "Filtre" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:317 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:326 msgid "toggle all" -msgstr "" +msgstr "basculer tous" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:328 msgid "Log" -msgstr "" +msgstr "Enregistrement" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:330 msgid "Graph" -msgstr "" +msgstr "Graphe" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:369 msgid "Advanced filter" @@ -1046,7 +1047,7 @@ msgstr "Configuration des tunnels I2P" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:305 msgid "The default settings work for most people." -msgstr "" +msgstr "La configuration défaut fonctionne pour le plupart des utilisateurs" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:309 msgid "There is a fundamental tradeoff between anonymity and performance." @@ -1082,11 +1083,11 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:106 msgid "config UI" -msgstr "" +msgstr "configuration IHM" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:241 msgid "I2P UI Configuration" -msgstr "" +msgstr "Configuration de l'IHM I2P" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:291 msgid "Router Console Theme" @@ -1110,11 +1111,11 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:106 msgid "config update" -msgstr "" +msgstr "Mettre à jour la configuration" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:228 msgid "I2P Update Configuration" -msgstr "" +msgstr "Configuration du mise à jour I2P" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:300 msgid "Check for I2P and news updates" @@ -1122,36 +1123,36 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:302 msgid "News & I2P Updates" -msgstr "" +msgstr "Actualités et mises à jour I2P" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:306 msgid "Update In Progress" -msgstr "" +msgstr "Mise à jour en cours" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:310 #: src/net/i2p/router/web/ConfigUpdateHandler.java:56 msgid "Check for updates" -msgstr "" +msgstr "Chercher des mises à jour" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:314 msgid "News URL" -msgstr "" +msgstr "Actualités URL" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:318 msgid "Refresh frequency" -msgstr "" +msgstr "Fréquence d'actualisation" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:322 msgid "Update policy" -msgstr "" +msgstr "Méthode de mise à jour" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:326 msgid "Update through the eepProxy?" -msgstr "" +msgstr "Mettre à jour utilisant l'eeProxy ?" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:330 msgid "eepProxy host" -msgstr "" +msgstr "eeProxy hôte" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:334 msgid "eepProxy port" @@ -1159,19 +1160,19 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:338 msgid "Update URLs" -msgstr "" +msgstr "Mettre à jour à partir de ces URLs" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:342 msgid "Trusted keys" -msgstr "" +msgstr "Clés auxquelles on peut faire confiance" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:346 msgid "Update with unsigned development builds?" -msgstr "" +msgstr "Mettre à jour avec une version de développement d'i2p qui n'a pas été signée" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:350 msgid "Unsigned Build URL" -msgstr "" +msgstr "L'URL de la version d'i2p qui n'a pas été signée" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:354 msgid "Save" @@ -1195,7 +1196,7 @@ msgstr "pas trouvé" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:106 msgid "graphs" -msgstr "" +msgstr "graphes" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:228 msgid "I2P Performance Graphs" @@ -1210,11 +1211,11 @@ msgstr "" #: src/net/i2p/router/web/SummaryBarRenderer.java:26 #: src/net/i2p/router/web/SummaryBarRenderer.java:28 msgid "I2P Router Console" -msgstr "" +msgstr "Console du routeur I2P" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:105 msgid "job queue" -msgstr "" +msgstr "queue des tâches" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:227 msgid "I2P Router Job Queue" @@ -1222,11 +1223,11 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:105 msgid "logs" -msgstr "" +msgstr "enregistrements" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:227 msgid "I2P Router Logs" -msgstr "" +msgstr "Enregistrements du routeur I2P" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:229 msgid "I2P Version & Running Environment" @@ -1246,15 +1247,15 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldstats_jsp.java:105 msgid "statistics" -msgstr "" +msgstr "statistiques" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldstats_jsp.java:242 msgid "I2P Router Statistics" -msgstr "" +msgstr "Statistiques du routeur I2P" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:105 msgid "peer connections" -msgstr "" +msgstr "connexions pairs" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:227 msgid "I2P Network Peers" @@ -1262,7 +1263,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:105 msgid "peer profiles" -msgstr "" +msgstr "profile des pairs" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:227 msgid "I2P Network Peer Profiles" @@ -1271,15 +1272,15 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:245 #, java-format msgid "Disable {0}s Refresh" -msgstr "" +msgstr "Désactiver {0}s actualisation" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:105 msgid "tunnel summary" -msgstr "" +msgstr "sommaire tunnel" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:227 msgid "I2P Tunnel Summary" -msgstr "" +msgstr "tunnel sommaire I2P" #: src/net/i2p/router/web/ConfigAdvancedHandler.java:57 msgid "Error updating the configuration - please see the error logs" @@ -1288,7 +1289,7 @@ msgstr "" #: src/net/i2p/router/web/ConfigAdvancedHandler.java:69 #: src/net/i2p/router/web/ConfigNetHandler.java:251 msgid "Configuration saved successfully" -msgstr "" +msgstr "Configuration sauvegardé avec succès" #: src/net/i2p/router/web/ConfigAdvancedHandler.java:71 #: src/net/i2p/router/web/ConfigNetHandler.java:253 @@ -1303,7 +1304,7 @@ msgstr "Démarrer" #: src/net/i2p/router/web/ConfigClientsHandler.java:68 #: src/net/i2p/router/web/ConfigKeyringHandler.java:49 msgid "Unsupported" -msgstr "" +msgstr "Non supportée" #: src/net/i2p/router/web/ConfigClientsHandler.java:83 msgid "Client configuration saved successfully - restart required to take effect." @@ -1323,7 +1324,7 @@ msgstr "Client" #: src/net/i2p/router/web/ConfigClientsHandler.java:94 #: src/net/i2p/router/web/ConfigClientsHandler.java:129 msgid "started" -msgstr "" +msgstr "démarré" #: src/net/i2p/router/web/ConfigClientsHandler.java:111 msgid "WebApp configuration saved successfully - restart required to take effect." @@ -1336,7 +1337,7 @@ msgstr "" #: src/net/i2p/router/web/ConfigClientsHandler.java:131 msgid "Failed to start" -msgstr "" +msgstr "Echec de démarrage" #: src/net/i2p/router/web/ConfigClientsHandler.java:137 msgid "Failed to find server." @@ -1349,12 +1350,12 @@ msgstr "" #: src/net/i2p/router/web/ConfigClientsHelper.java:17 #: src/net/i2p/router/web/ConfigClientsHelper.java:34 msgid "Run at Startup?" -msgstr "" +msgstr "Lancer au démarrage ?" #: src/net/i2p/router/web/ConfigClientsHelper.java:17 #: src/net/i2p/router/web/ConfigClientsHelper.java:34 msgid "Start Now" -msgstr "" +msgstr "Démarrer tout de suite" #: src/net/i2p/router/web/ConfigClientsHelper.java:34 msgid "Description" @@ -1362,37 +1363,37 @@ msgstr "" #: src/net/i2p/router/web/ConfigKeyringHandler.java:21 msgid "You must enter a destination" -msgstr "" +msgstr "Vous devez saisir une destination" #: src/net/i2p/router/web/ConfigKeyringHandler.java:23 msgid "You must enter a key" -msgstr "" +msgstr "Vous devez saisir une clé" #: src/net/i2p/router/web/ConfigKeyringHandler.java:34 #: src/net/i2p/router/web/ConfigKeyringHandler.java:41 #: src/net/i2p/router/web/ConfigKeyringHandler.java:43 msgid "Key for" -msgstr "" +msgstr "Clé pour" #: src/net/i2p/router/web/ConfigKeyringHandler.java:34 msgid "added to keyring" -msgstr "" +msgstr "ajouté au porte-clés " #: src/net/i2p/router/web/ConfigKeyringHandler.java:36 msgid "Invalid destination or key" -msgstr "" +msgstr "Destination ou clé pas valable" #: src/net/i2p/router/web/ConfigKeyringHandler.java:41 msgid "removed from keyring" -msgstr "" +msgstr "enlévé du porte-clés" #: src/net/i2p/router/web/ConfigKeyringHandler.java:43 msgid "not found in keyring" -msgstr "" +msgstr "pas trouvé sur le porte-clés" #: src/net/i2p/router/web/ConfigKeyringHandler.java:45 msgid "Invalid destination" -msgstr "" +msgstr "Destination pas valable" #: src/net/i2p/router/web/ConfigLoggingHelper.java:52 msgid "CRIT" @@ -1416,7 +1417,7 @@ msgstr "" #: src/net/i2p/router/web/ConfigNavHelper.java:18 msgid "Network" -msgstr "" +msgstr "Réseau" #: src/net/i2p/router/web/ConfigNavHelper.java:18 msgid "Service" @@ -1426,7 +1427,7 @@ msgstr "" #: src/net/i2p/router/web/SummaryBarRenderer.java:82 #: src/net/i2p/router/web/TunnelRenderer.java:253 msgid "Tunnels" -msgstr "Tunnels" +msgstr "" #: src/net/i2p/router/web/ConfigNavHelper.java:18 msgid "UI" @@ -1440,23 +1441,23 @@ msgstr "Mettre à jour" #: src/net/i2p/router/web/ConfigNavHelper.java:19 msgid "Clients" -msgstr "" +msgstr "Clients" #: src/net/i2p/router/web/ConfigNavHelper.java:19 msgid "Logging" -msgstr "" +msgstr "Enregistrements" #: src/net/i2p/router/web/ConfigNavHelper.java:19 #: src/net/i2p/router/web/SummaryBarRenderer.java:88 #: src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Peers" -msgstr "" +msgstr "Pairs" #: src/net/i2p/router/web/ConfigNavHelper.java:19 #: src/net/i2p/router/web/NetDbRenderer.java:256 #: src/net/i2p/router/web/SummaryBarRenderer.java:124 msgid "Stats" -msgstr "" +msgstr "Statistiques" #: src/net/i2p/router/web/ConfigNavHelper.java:20 msgid "Advanced" @@ -1468,7 +1469,7 @@ msgstr "" #: src/net/i2p/router/web/ConfigNetHandler.java:148 msgid "Updating IP address" -msgstr "" +msgstr "Mise à jour d'adresse IP en cours" #: src/net/i2p/router/web/ConfigNetHandler.java:166 msgid "Disabling TCP completely" @@ -1532,7 +1533,7 @@ msgstr "" #: src/net/i2p/router/web/ConfigNetHandler.java:363 msgid "Updated bandwidth limits" -msgstr "" +msgstr "Limitations mises à jour de la bande passante " #: src/net/i2p/router/web/ConfigNetHelper.java:39 #: src/net/i2p/router/web/ConfigNetHelper.java:47 @@ -1552,7 +1553,7 @@ msgstr "bits par seconde" #: src/net/i2p/router/web/ProfileOrganizerRenderer.java:69 #: src/net/i2p/router/web/TunnelRenderer.java:235 msgid "Peer" -msgstr "" +msgstr "Pair" #: src/net/i2p/router/web/ConfigPeerHandler.java:24 msgid "banned until restart" @@ -1562,7 +1563,7 @@ msgstr "" #: src/net/i2p/router/web/ConfigPeerHandler.java:38 #: src/net/i2p/router/web/ConfigPeerHandler.java:59 msgid "Invalid peer" -msgstr "" +msgstr "Pair pas valable" #: src/net/i2p/router/web/ConfigPeerHandler.java:33 msgid "unbanned" @@ -1578,7 +1579,7 @@ msgstr "" #: src/net/i2p/router/web/ConfigPeerHandler.java:52 msgid "Bad capacity value" -msgstr "" +msgstr "Mauvaise valeur de capacité" #: src/net/i2p/router/web/ConfigRestartBean.java:36 msgid "Cancel shutdown" @@ -1594,21 +1595,21 @@ msgstr "Redémarrer" #: src/net/i2p/router/web/ConfigRestartBean.java:45 msgid "Shutdown" -msgstr "" +msgstr "Fermer" #: src/net/i2p/router/web/ConfigRestartBean.java:56 msgid "Shutdown imminent" -msgstr "" +msgstr "Fermature imminente" #: src/net/i2p/router/web/ConfigRestartBean.java:59 #, java-format msgid "Shutdown in {0}" -msgstr "" +msgstr "Fermature en {0}" #: src/net/i2p/router/web/ConfigRestartBean.java:64 #, java-format msgid "Restart in {0}" -msgstr "" +msgstr "Redémarrage en {0}" #: src/net/i2p/router/web/ConfigServiceHandler.java:56 msgid "Graceful shutdown initiated" @@ -1620,15 +1621,15 @@ msgstr "" #: src/net/i2p/router/web/ConfigServiceHandler.java:63 msgid "Graceful shutdown cancelled" -msgstr "" +msgstr "Fermeture gracieux annulée" #: src/net/i2p/router/web/ConfigServiceHandler.java:67 msgid "Graceful restart requested" -msgstr "" +msgstr "Redémarrage gracieux demandé" #: src/net/i2p/router/web/ConfigServiceHandler.java:71 msgid "Hard restart requested" -msgstr "" +msgstr "Redémarrage immédiate demandé" #: src/net/i2p/router/web/ConfigServiceHandler.java:72 msgid "Rekey and Restart" @@ -1674,7 +1675,7 @@ msgstr "" #: src/net/i2p/router/web/ConfigServiceHandler.java:129 msgid "Service installed" -msgstr "" +msgstr "Service installé" #: src/net/i2p/router/web/ConfigServiceHandler.java:131 msgid "Warning: unable to install the service" @@ -1682,7 +1683,7 @@ msgstr "" #: src/net/i2p/router/web/ConfigServiceHandler.java:137 msgid "Service removed" -msgstr "" +msgstr "Service enlévé" #: src/net/i2p/router/web/ConfigServiceHandler.java:139 msgid "Warning: unable to remove the service" @@ -1715,7 +1716,7 @@ msgstr "saut" #: src/net/i2p/router/web/ConfigTunnelsHelper.java:12 msgid "tunnel" -msgstr "tunnel" +msgstr "" #: src/net/i2p/router/web/ConfigTunnelsHelper.java:14 msgid "hops" @@ -1723,7 +1724,7 @@ msgstr "sauts" #: src/net/i2p/router/web/ConfigTunnelsHelper.java:15 msgid "tunnels" -msgstr "tunnels" +msgstr "" #: src/net/i2p/router/web/ConfigTunnelsHelper.java:26 #: src/net/i2p/router/web/TunnelRenderer.java:40 @@ -1765,27 +1766,27 @@ msgstr "Profondeur" #: src/net/i2p/router/web/ConfigTunnelsHelper.java:104 msgid "Randomization" -msgstr "" +msgstr "Randomisation" #: src/net/i2p/router/web/ConfigTunnelsHelper.java:128 msgid "Quantity" -msgstr "" +msgstr "Quantité" #: src/net/i2p/router/web/ConfigTunnelsHelper.java:145 msgid "Backup quantity" -msgstr "" +msgstr "'Backup' quantité" #: src/net/i2p/router/web/ConfigTunnelsHelper.java:167 msgid "Inbound options" -msgstr "" +msgstr "Options Entrants" #: src/net/i2p/router/web/ConfigTunnelsHelper.java:180 msgid "Outbound options" -msgstr "" +msgstr "Options Sortants" #: src/net/i2p/router/web/ConfigUIHandler.java:31 msgid "Theme change saved." -msgstr "" +msgstr "Changement de thème sauvegardé." #: src/net/i2p/router/web/ConfigUIHandler.java:33 msgid "Refresh the page to view." @@ -1801,19 +1802,19 @@ msgstr "Français" #: src/net/i2p/router/web/ConfigUIHelper.java:40 msgid "German" -msgstr "" +msgstr "Allemand" #: src/net/i2p/router/web/ConfigUIHelper.java:41 msgid "Chinese" -msgstr "" +msgstr "Chinois" #: src/net/i2p/router/web/ConfigUIHelper.java:41 msgid "Dutch" -msgstr "" +msgstr "Néerlandais" #: src/net/i2p/router/web/ConfigUIHelper.java:41 msgid "Swedish" -msgstr "" +msgstr "Suédois" #: src/net/i2p/router/web/ConfigUpdateHandler.java:63 msgid "Update available, attempting to download now" @@ -1871,7 +1872,7 @@ msgstr "Chaque" #: src/net/i2p/router/web/ConfigUpdateHelper.java:90 #: src/net/i2p/router/web/ConfigUpdateHelper.java:92 msgid "Notify only" -msgstr "" +msgstr "Notifier seulement" #: src/net/i2p/router/web/ConfigUpdateHelper.java:95 #: src/net/i2p/router/web/ConfigUpdateHelper.java:97 @@ -1881,11 +1882,11 @@ msgstr "Télécharger et vérifier seulement" #: src/net/i2p/router/web/ConfigUpdateHelper.java:101 #: src/net/i2p/router/web/ConfigUpdateHelper.java:103 msgid "Download, verify, and restart" -msgstr "" +msgstr "Télécharger, vérifier et redémarrer" #: src/net/i2p/router/web/GraphHelper.java:107 msgid "Configure Graph Display" -msgstr "" +msgstr "Graphe affichage configuration" #: src/net/i2p/router/web/GraphHelper.java:107 msgid "Select Stats" @@ -1893,27 +1894,27 @@ msgstr "" #: src/net/i2p/router/web/GraphHelper.java:109 msgid "Periods" -msgstr "" +msgstr "Périodes" #: src/net/i2p/router/web/GraphHelper.java:110 msgid "Plot averages" -msgstr "" +msgstr "Tracer les moyennes" #: src/net/i2p/router/web/GraphHelper.java:111 msgid "plot events" -msgstr "" +msgstr "tracer les événements" #: src/net/i2p/router/web/GraphHelper.java:112 msgid "Image sizes" -msgstr "" +msgstr "Taille des images" #: src/net/i2p/router/web/GraphHelper.java:112 msgid "width" -msgstr "" +msgstr "largeur" #: src/net/i2p/router/web/GraphHelper.java:113 msgid "height" -msgstr "" +msgstr "hauteur" #: src/net/i2p/router/web/GraphHelper.java:113 #: src/net/i2p/router/web/GraphHelper.java:114 @@ -1922,7 +1923,7 @@ msgstr "pixels" #: src/net/i2p/router/web/GraphHelper.java:115 msgid "Refresh delay" -msgstr "" +msgstr "Delai d'actualisation" #: src/net/i2p/router/web/GraphHelper.java:115 msgid "hour" @@ -1930,7 +1931,7 @@ msgstr "heure" #: src/net/i2p/router/web/GraphHelper.java:115 msgid "minute" -msgstr "minute" +msgstr "" #: src/net/i2p/router/web/GraphHelper.java:115 msgid "minutes" @@ -1968,22 +1969,22 @@ msgstr "Locale" #: src/net/i2p/router/web/NetDbRenderer.java:100 msgid "Unpublished" -msgstr "" +msgstr "Pas publié" #: src/net/i2p/router/web/NetDbRenderer.java:101 #: src/net/i2p/router/web/NetDbRenderer.java:108 msgid "Destination" -msgstr "Destination" +msgstr "" #: src/net/i2p/router/web/NetDbRenderer.java:118 #, java-format msgid "Expires in {0}" -msgstr "" +msgstr "Expirera en {0}" #: src/net/i2p/router/web/NetDbRenderer.java:120 #, java-format msgid "Expired {0} ago" -msgstr "" +msgstr "Périmé il y a {0}" #: src/net/i2p/router/web/NetDbRenderer.java:122 #: src/net/i2p/router/web/TunnelRenderer.java:156 @@ -1992,27 +1993,27 @@ msgstr "" #: src/net/i2p/router/web/NetDbRenderer.java:122 msgid "Lease" -msgstr "" +msgstr "Bail" #: src/net/i2p/router/web/NetDbRenderer.java:124 msgid "Tunnel" -msgstr "Tunnel" +msgstr "" #: src/net/i2p/router/web/NetDbRenderer.java:137 msgid "Not initialized" -msgstr "" +msgstr "Pas initialisé" #: src/net/i2p/router/web/NetDbRenderer.java:143 msgid "Routers" -msgstr "" +msgstr "Routeurs" #: src/net/i2p/router/web/NetDbRenderer.java:145 msgid "view without" -msgstr "" +msgstr "montrer sans" #: src/net/i2p/router/web/NetDbRenderer.java:147 msgid "view with" -msgstr "" +msgstr "montrer avec" #: src/net/i2p/router/web/NetDbRenderer.java:148 msgid "stats" @@ -2026,7 +2027,7 @@ msgstr "" #: src/net/i2p/router/web/NetDbRenderer.java:183 #: src/net/i2p/router/web/SummaryBarRenderer.java:150 msgid "Version" -msgstr "" +msgstr "Version" #: src/net/i2p/router/web/NetDbRenderer.java:199 msgid "Country" @@ -2038,7 +2039,7 @@ msgstr "Notre info" #: src/net/i2p/router/web/NetDbRenderer.java:224 msgid "Peer info for" -msgstr "" +msgstr "Mise à jour en cours" #: src/net/i2p/router/web/NetDbRenderer.java:228 msgid "Full entry" @@ -2046,46 +2047,46 @@ msgstr "" #: src/net/i2p/router/web/NetDbRenderer.java:234 msgid "Updated" -msgstr "" +msgstr "Mise à jour fini" #: src/net/i2p/router/web/NetDbRenderer.java:234 #: src/net/i2p/router/web/NetDbRenderer.java:236 #: src/net/i2p/router/web/SummaryHelper.java:385 msgid "ago" -msgstr "" +msgstr ":" #: src/net/i2p/router/web/NetDbRenderer.java:236 #: src/net/i2p/router/web/NetDbRenderer.java:238 msgid "Published" -msgstr "" +msgstr "Publié il y a" #: src/net/i2p/router/web/NetDbRenderer.java:239 msgid "Address(es)" -msgstr "" +msgstr "Adresse(s)" #: src/net/i2p/router/web/NewsFetcher.java:80 #, java-format msgid "News last updated {0} ago." -msgstr "" +msgstr "Actualités mises à jour il y a {0}" #: src/net/i2p/router/web/NewsFetcher.java:86 #, java-format msgid "News last checked {0} ago." -msgstr "" +msgstr "Actualités vérifiés il y a {0}" #: src/net/i2p/router/web/ProfileOrganizerRenderer.java:63 msgid "Peer Profiles" -msgstr "" +msgstr "Profils des pairs" #: src/net/i2p/router/web/ProfileOrganizerRenderer.java:64 #, java-format msgid "Showing {0} recent profiles." -msgstr "" +msgstr "Montrant {0} profiles récents" #: src/net/i2p/router/web/ProfileOrganizerRenderer.java:65 #, java-format msgid "Hiding {0} older profiles." -msgstr "" +msgstr "Cachant {0} profiles anciens" #: src/net/i2p/router/web/ProfileOrganizerRenderer.java:70 msgid "Groups (Caps)" @@ -2094,7 +2095,7 @@ msgstr "" #: src/net/i2p/router/web/ProfileOrganizerRenderer.java:73 #: src/net/i2p/router/web/ProfileOrganizerRenderer.java:233 msgid "Integration" -msgstr "" +msgstr "Intégration" #: src/net/i2p/router/web/ProfileOrganizerRenderer.java:74 msgid "Status" @@ -2115,7 +2116,7 @@ msgstr "" #: src/net/i2p/router/web/ProfileOrganizerRenderer.java:114 #: src/net/i2p/router/web/ProfileOrganizerRenderer.java:148 msgid "Failing" -msgstr "" +msgstr "Défaillant" #: src/net/i2p/router/web/ProfileOrganizerRenderer.java:116 #: src/net/i2p/router/web/SummaryBarRenderer.java:249 @@ -2128,23 +2129,23 @@ msgstr "Prohibé" #: src/net/i2p/router/web/ProfileOrganizerRenderer.java:149 msgid "Unreachable" -msgstr "" +msgstr "Inaccessible" #: src/net/i2p/router/web/ProfileOrganizerRenderer.java:156 msgid "Test Fails" -msgstr "" +msgstr "Test échec" #: src/net/i2p/router/web/ProfileOrganizerRenderer.java:168 msgid "Floodfill and Integrated Peers" -msgstr "" +msgstr "Floodfill et pairs intégrés" #: src/net/i2p/router/web/ProfileOrganizerRenderer.java:230 msgid "Thresholds:" -msgstr "" +msgstr "Seuils :" #: src/net/i2p/router/web/ProfileOrganizerRenderer.java:234 msgid "Definitions" -msgstr "" +msgstr "Définitions" #: src/net/i2p/router/web/ProfileOrganizerRenderer.java:235 msgid "as determined by the profile organizer" @@ -2152,7 +2153,7 @@ msgstr "" #: src/net/i2p/router/web/ProfileOrganizerRenderer.java:235 msgid "groups" -msgstr "" +msgstr "groupes" #: src/net/i2p/router/web/ProfileOrganizerRenderer.java:236 msgid "capabilities in the netDb, not used to determine profiles" @@ -2184,7 +2185,7 @@ msgstr "" #: src/net/i2p/router/web/ProfileOrganizerRenderer.java:239 msgid "integration" -msgstr "" +msgstr "intégration" #: src/net/i2p/router/web/ProfileOrganizerRenderer.java:240 msgid "is the peer banned, or unreachable, or failing tunnel tests?" @@ -2192,7 +2193,7 @@ msgstr "" #: src/net/i2p/router/web/ProfileOrganizerRenderer.java:240 msgid "status" -msgstr "" +msgstr "statut" #: src/net/i2p/router/web/StatsGenerator.java:58 msgid "Statistics gathered during this router's uptime" @@ -2208,7 +2209,7 @@ msgstr "" #: src/net/i2p/router/web/SummaryBarRenderer.java:42 msgid "I2P Services" -msgstr "" +msgstr "Services I2P" #: src/net/i2p/router/web/SummaryBarRenderer.java:48 msgid "Manage your I2P hosts file here (I2P domain name resolution)" @@ -2216,39 +2217,39 @@ msgstr "" #: src/net/i2p/router/web/SummaryBarRenderer.java:50 msgid "Addressbook" -msgstr "" +msgstr "Carnet d'adresses" #: src/net/i2p/router/web/SummaryBarRenderer.java:54 msgid "Built-in anonymous BitTorrent Client" -msgstr "" +msgstr "Client bittorrent anonyme" #: src/net/i2p/router/web/SummaryBarRenderer.java:56 msgid "Torrents" -msgstr "" +msgstr "Torrents" #: src/net/i2p/router/web/SummaryBarRenderer.java:60 msgid "Anonymous webmail client" -msgstr "" +msgstr "Client webmail anonyme" #: src/net/i2p/router/web/SummaryBarRenderer.java:62 msgid "Webmail" -msgstr "" +msgstr "messagerie Web" #: src/net/i2p/router/web/SummaryBarRenderer.java:66 msgid "Anonymous resident webserver" -msgstr "" +msgstr "Serveur web anonyme" #: src/net/i2p/router/web/SummaryBarRenderer.java:68 msgid "Webserver" -msgstr "" +msgstr "Serveur web" #: src/net/i2p/router/web/SummaryBarRenderer.java:72 msgid "Configure I2P Router" -msgstr "" +msgstr "I2P Routeur Configuration" #: src/net/i2p/router/web/SummaryBarRenderer.java:74 msgid "I2P Internals" -msgstr "" +msgstr "I2P Configuration Interne" #: src/net/i2p/router/web/SummaryBarRenderer.java:80 #: src/net/i2p/router/web/SummaryBarRenderer.java:344 @@ -2258,7 +2259,7 @@ msgstr "" #: src/net/i2p/router/web/SummaryBarRenderer.java:86 #: src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Show all current peer connections" -msgstr "" +msgstr "Montrer toutes les connexions actuelles aux pairs" #: src/net/i2p/router/web/SummaryBarRenderer.java:92 msgid "Show recent peer performance profiles" @@ -2266,11 +2267,11 @@ msgstr "" #: src/net/i2p/router/web/SummaryBarRenderer.java:94 msgid "Profiles" -msgstr "" +msgstr "Profiles" #: src/net/i2p/router/web/SummaryBarRenderer.java:98 msgid "Show list of all known I2P routers" -msgstr "" +msgstr "Montrer une liste de touts le routeurs I2P connus" #: src/net/i2p/router/web/SummaryBarRenderer.java:100 msgid "NetDB" @@ -2282,7 +2283,7 @@ msgstr "" #: src/net/i2p/router/web/SummaryBarRenderer.java:106 msgid "Logs" -msgstr "" +msgstr "Enregistrements" #: src/net/i2p/router/web/SummaryBarRenderer.java:110 msgid "Show the router's workload, and how it's performing" @@ -2290,7 +2291,7 @@ msgstr "" #: src/net/i2p/router/web/SummaryBarRenderer.java:112 msgid "Jobs" -msgstr "" +msgstr "Tâches" #: src/net/i2p/router/web/SummaryBarRenderer.java:116 msgid "Graph router performance" @@ -2298,7 +2299,7 @@ msgstr "" #: src/net/i2p/router/web/SummaryBarRenderer.java:118 msgid "Graphs" -msgstr "" +msgstr "Graphes" #: src/net/i2p/router/web/SummaryBarRenderer.java:122 msgid "Textual router performance statistics" @@ -2306,19 +2307,19 @@ msgstr "" #: src/net/i2p/router/web/SummaryBarRenderer.java:134 msgid "I2P Router Help" -msgstr "" +msgstr "Aide routeur I2P" #: src/net/i2p/router/web/SummaryBarRenderer.java:136 msgid "General" -msgstr "" +msgstr "Général" #: src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Your unique I2P router identity is" -msgstr "" +msgstr "L'identité unique de votre routeur est" #: src/net/i2p/router/web/SummaryBarRenderer.java:143 msgid "never reveal it to anyone" -msgstr "" +msgstr "révéler jamais à personne" #: src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Local Identity" @@ -2330,19 +2331,19 @@ msgstr "" #: src/net/i2p/router/web/SummaryBarRenderer.java:160 msgid "Uptime" -msgstr "" +msgstr "Temps de service" #: src/net/i2p/router/web/SummaryBarRenderer.java:167 msgid "Help with configuring your firewall and router for optimal I2P performance" -msgstr "" +msgstr "Aide avec la configuration du pare-feu et du routeur afin d'optimiser la performance d'I2P" #: src/net/i2p/router/web/SummaryBarRenderer.java:194 msgid "Download" -msgstr "" +msgstr "Télécharger" #: src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Download Unsigned" -msgstr "" +msgstr "Télécharger pas signé" #: src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Active" @@ -2362,11 +2363,11 @@ msgstr "Connu" #: src/net/i2p/router/web/SummaryBarRenderer.java:270 msgid "Help with firewall configuration" -msgstr "" +msgstr "Aide avec la configuration du pare-feu" #: src/net/i2p/router/web/SummaryBarRenderer.java:272 msgid "Check NAT/firewall" -msgstr "" +msgstr "Vérifier NAT/pare-feu" #: src/net/i2p/router/web/SummaryBarRenderer.java:292 msgid "Reseed" @@ -2378,11 +2379,11 @@ msgstr "" #: src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "Bandwidth in/out" -msgstr "" +msgstr "Bande passante entrant/sortant" #: src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Total" -msgstr "Total" +msgstr "" #: src/net/i2p/router/web/SummaryBarRenderer.java:336 msgid "Used" @@ -2406,23 +2407,23 @@ msgstr "" #: src/net/i2p/router/web/SummaryBarRenderer.java:375 msgid "Congestion" -msgstr "" +msgstr "Saturation réseau" #: src/net/i2p/router/web/SummaryBarRenderer.java:380 msgid "Job lag" -msgstr "" +msgstr "Tâche décalage" #: src/net/i2p/router/web/SummaryBarRenderer.java:386 msgid "Message delay" -msgstr "" +msgstr "Message retard" #: src/net/i2p/router/web/SummaryBarRenderer.java:392 msgid "Tunnel lag" -msgstr "" +msgstr "Tunnel décalage" #: src/net/i2p/router/web/SummaryBarRenderer.java:398 msgid "Backlog" -msgstr "" +msgstr "Retard accumulé" #: src/net/i2p/router/web/SummaryHelper.java:73 msgid "skew" @@ -2482,11 +2483,11 @@ msgstr "Serveur" #: src/net/i2p/router/web/SummaryHelper.java:373 msgid "Show tunnels" -msgstr "" +msgstr "Montrer les tunnels" #: src/net/i2p/router/web/SummaryHelper.java:384 msgid "Leases expired" -msgstr "" +msgstr "Bails périmés" #: src/net/i2p/router/web/SummaryHelper.java:384 #: src/net/i2p/router/web/SummaryHelper.java:385 @@ -2503,17 +2504,17 @@ msgstr "" #: src/net/i2p/router/web/SummaryHelper.java:392 msgid "Building tunnels" -msgstr "" +msgstr "Création des tunnels en cours" #: src/net/i2p/router/web/SummaryHelper.java:404 #: strings/Strings.java:33 msgid "shared clients" -msgstr "" +msgstr "clients partagés" #: src/net/i2p/router/web/TunnelRenderer.java:40 #: src/net/i2p/router/web/TunnelRenderer.java:62 msgid "config" -msgstr "" +msgstr "configuration" #: src/net/i2p/router/web/TunnelRenderer.java:70 msgid "Participating tunnels" @@ -2525,15 +2526,15 @@ msgstr "De" #: src/net/i2p/router/web/TunnelRenderer.java:71 msgid "Receive on" -msgstr "" +msgstr "Réception active" #: src/net/i2p/router/web/TunnelRenderer.java:72 msgid "Expiration" -msgstr "" +msgstr "Expiration" #: src/net/i2p/router/web/TunnelRenderer.java:72 msgid "Send on" -msgstr "" +msgstr "Envoyer activé" #: src/net/i2p/router/web/TunnelRenderer.java:72 msgid "To" @@ -2541,24 +2542,24 @@ msgstr "à" #: src/net/i2p/router/web/TunnelRenderer.java:73 msgid "Rate" -msgstr "" +msgstr "Taux" #: src/net/i2p/router/web/TunnelRenderer.java:73 msgid "Role" -msgstr "" +msgstr "Rôle" #: src/net/i2p/router/web/TunnelRenderer.java:73 #: src/net/i2p/router/web/TunnelRenderer.java:156 msgid "Usage" -msgstr "" +msgstr "Utilisation" #: src/net/i2p/router/web/TunnelRenderer.java:117 msgid "Outbound Endpoint" -msgstr "" +msgstr "Endpoint Sortant" #: src/net/i2p/router/web/TunnelRenderer.java:119 msgid "Inbound Gateway" -msgstr "" +msgstr "Gateway Entrant" #: src/net/i2p/router/web/TunnelRenderer.java:121 #: src/net/i2p/router/web/TunnelRenderer.java:162 @@ -2576,7 +2577,7 @@ msgstr "" #: src/net/i2p/router/web/TunnelRenderer.java:156 msgid "Expiry" -msgstr "" +msgstr "Echéance" #: src/net/i2p/router/web/TunnelRenderer.java:156 msgid "In/Out" @@ -2593,7 +2594,7 @@ msgstr "" #: src/net/i2p/router/web/TunnelRenderer.java:205 #: src/net/i2p/router/web/TunnelRenderer.java:211 msgid "Build in progress" -msgstr "" +msgstr "Création d'un tunnel en cours" #: src/net/i2p/router/web/TunnelRenderer.java:205 msgid "inbound" @@ -2605,7 +2606,7 @@ msgstr "sortant" #: src/net/i2p/router/web/TunnelRenderer.java:215 msgid "No tunnels; waiting for the grace period to end." -msgstr "" +msgstr "Pas de tunnel; attendant la fin du délai de grâce" #: src/net/i2p/router/web/TunnelRenderer.java:216 msgid "in" @@ -2617,7 +2618,7 @@ msgstr "sortir" #: src/net/i2p/router/web/TunnelRenderer.java:234 msgid "Tunnel Counts By Peer" -msgstr "" +msgstr "Nombre de tunnels par pair" #: src/net/i2p/router/web/TunnelRenderer.java:235 msgid "% of total" @@ -2653,11 +2654,11 @@ msgstr "susidns" #: strings/Strings.java:17 msgid "routerconsole" -msgstr "" +msgstr "routeurconsole" #: strings/Strings.java:22 msgid "Web console" -msgstr "" +msgstr "Console web" #: strings/Strings.java:23 msgid "SAM application bridge" From 9e4f04cc18d44bf2210b5b30709b65dd9bdbb249 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 2 Dec 2009 16:50:15 +0000 Subject: [PATCH 023/127] fix exception text --- core/java/src/net/i2p/data/Hash.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/src/net/i2p/data/Hash.java b/core/java/src/net/i2p/data/Hash.java index 10856d0c2..ddf210c54 100644 --- a/core/java/src/net/i2p/data/Hash.java +++ b/core/java/src/net/i2p/data/Hash.java @@ -140,7 +140,7 @@ public class Hash extends DataStructureImpl { public void writeBytes(OutputStream out) throws DataFormatException, IOException { if (_data == null) throw new DataFormatException("No data in the hash to write out"); - if (_data.length != HASH_LENGTH) throw new DataFormatException("Invalid size of data in the private key"); + if (_data.length != HASH_LENGTH) throw new DataFormatException("Invalid size of data in the hash"); out.write(_data); } From 9f7bd99051da5fa83879968985719282bc313e85 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 2 Dec 2009 16:50:42 +0000 Subject: [PATCH 024/127] fix popup based on torrent type --- .../java/src/org/klomp/snark/web/I2PSnarkServlet.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index a4ac23b43..5beb0ae44 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -496,9 +496,14 @@ public class I2PSnarkServlet extends HttpServlet { out.write(statusString + "

    		"); - if (remaining == 0) + if (remaining == 0) { out.write(""); + + "\" title=\""); + if (snark.meta.getFiles() != null) + out.write("View files\">"); + else + out.write("Open file\">"); + } out.write(filename); if (remaining == 0) out.write(""); From 7262c014c02fcc86c2706d267a6e7a1763c807b0 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 4 Dec 2009 00:20:43 +0000 Subject: [PATCH 025/127] * I2CP: Implement an internal "socket" class that allows clients in the same JVM to connect to the router without going through the kernel --- .../src/net/i2p/client/I2PSessionImpl.java | 6 +- .../src/net/i2p/client/I2PSimpleClient.java | 4 +- .../src/net/i2p/client/I2PSimpleSession.java | 5 +- .../net/i2p/util/InternalServerSocket.java | 199 ++++++++++++++ .../java/src/net/i2p/util/InternalSocket.java | 259 ++++++++++++++++++ router/java/src/net/i2p/router/Router.java | 3 + .../router/client/ClientListenerRunner.java | 22 +- .../net/i2p/router/client/ClientManager.java | 18 +- .../client/InternalClientListenerRunner.java | 88 ++++++ 9 files changed, 584 insertions(+), 20 deletions(-) create mode 100644 core/java/src/net/i2p/util/InternalServerSocket.java create mode 100644 core/java/src/net/i2p/util/InternalSocket.java create mode 100644 router/java/src/net/i2p/router/client/InternalClientListenerRunner.java diff --git a/core/java/src/net/i2p/client/I2PSessionImpl.java b/core/java/src/net/i2p/client/I2PSessionImpl.java index 0cbde00ce..c11c71549 100644 --- a/core/java/src/net/i2p/client/I2PSessionImpl.java +++ b/core/java/src/net/i2p/client/I2PSessionImpl.java @@ -39,6 +39,7 @@ import net.i2p.data.i2cp.I2CPMessageReader; import net.i2p.data.i2cp.MessagePayloadMessage; import net.i2p.data.i2cp.SessionId; import net.i2p.util.I2PThread; +import net.i2p.util.InternalSocket; import net.i2p.util.Log; import net.i2p.util.SimpleScheduler; import net.i2p.util.SimpleTimer; @@ -268,12 +269,13 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa long startConnect = _context.clock().now(); try { - if (_log.shouldLog(Log.DEBUG)) _log.debug(getPrefix() + "connect begin to " + _hostname + ":" + _portNum); - _socket = new Socket(_hostname, _portNum); + // If we are in the router JVM, connect using the interal pseudo-socket + _socket = InternalSocket.getSocket(_hostname, _portNum); // _socket.setSoTimeout(1000000); // Uhmmm we could really-really use a real timeout, and handle it. _out = _socket.getOutputStream(); synchronized (_out) { _out.write(I2PClient.PROTOCOL_BYTE); + _out.flush(); } InputStream in = _socket.getInputStream(); _reader = new I2CPMessageReader(in, this); diff --git a/core/java/src/net/i2p/client/I2PSimpleClient.java b/core/java/src/net/i2p/client/I2PSimpleClient.java index 9ce4b8d6f..e91ae2f8b 100644 --- a/core/java/src/net/i2p/client/I2PSimpleClient.java +++ b/core/java/src/net/i2p/client/I2PSimpleClient.java @@ -20,12 +20,12 @@ import net.i2p.data.Destination; * just used to talk to the router. */ public class I2PSimpleClient implements I2PClient { - /** Don't do this */ + /** @deprecated Don't do this */ public Destination createDestination(OutputStream destKeyStream) throws I2PException, IOException { return null; } - /** or this */ + /** @deprecated or this */ public Destination createDestination(OutputStream destKeyStream, Certificate cert) throws I2PException, IOException { return null; } diff --git a/core/java/src/net/i2p/client/I2PSimpleSession.java b/core/java/src/net/i2p/client/I2PSimpleSession.java index bdc384b44..933a9578c 100644 --- a/core/java/src/net/i2p/client/I2PSimpleSession.java +++ b/core/java/src/net/i2p/client/I2PSimpleSession.java @@ -20,6 +20,7 @@ import net.i2p.data.i2cp.DestReplyMessage; import net.i2p.data.i2cp.GetBandwidthLimitsMessage; import net.i2p.data.i2cp.I2CPMessageReader; import net.i2p.util.I2PThread; +import net.i2p.util.InternalSocket; /** * Create a new session for doing naming and bandwidth queries only. Do not create a Destination. @@ -71,10 +72,12 @@ class I2PSimpleSession extends I2PSessionImpl2 { notifier.start(); try { - _socket = new Socket(_hostname, _portNum); + // If we are in the router JVM, connect using the interal pseudo-socket + _socket = InternalSocket.getSocket(_hostname, _portNum); _out = _socket.getOutputStream(); synchronized (_out) { _out.write(I2PClient.PROTOCOL_BYTE); + _out.flush(); } InputStream in = _socket.getInputStream(); _reader = new I2CPMessageReader(in, this); diff --git a/core/java/src/net/i2p/util/InternalServerSocket.java b/core/java/src/net/i2p/util/InternalServerSocket.java new file mode 100644 index 000000000..00d8352ee --- /dev/null +++ b/core/java/src/net/i2p/util/InternalServerSocket.java @@ -0,0 +1,199 @@ +package net.i2p.util; + +import java.io.BufferedOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.PipedInputStream; +import java.io.PipedOutputStream; +import java.net.InetAddress; +import java.net.ServerSocket; +import java.net.Socket; +import java.net.SocketAddress; +import java.nio.channels.ServerSocketChannel; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.LinkedBlockingQueue; + +import net.i2p.I2PAppContext; + +/** + * A simple in-JVM ServerSocket using Piped Streams. + * We use port numbers just like regular sockets. + * Can only be connected by InternalSocket. + */ +public class InternalServerSocket extends ServerSocket { + private static final ConcurrentHashMap _sockets = new ConcurrentHashMap(4); + private BlockingQueue _acceptQueue; + private Integer _port; + private boolean _running; + private static Log _log = I2PAppContext.getGlobalContext().logManager().getLog(InternalServerSocket.class); + + public InternalServerSocket(int port) throws IOException { + if (port <= 0) + throw new IOException("Bad port: " + port); + _port = Integer.valueOf(port); + InternalServerSocket previous = _sockets.putIfAbsent(_port, this); + if (previous != null) + throw new IOException("Internal port in use: " + port); + _running = true; + _acceptQueue = new LinkedBlockingQueue(); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Registered " + _port); + } + + @Override + public void close() { + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Closing " + _port); + _running = false; + _sockets.remove(_port); + _acceptQueue.clear(); + try { + // use null streams as a poison + _acceptQueue.put(new InternalSocket(null, null)); + } catch (InterruptedException ie) {} + } + + @Override + public Socket accept() throws IOException { + InternalSocket serverSock = null; + while (_running) { + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Accepting " + _port); + try { + serverSock = _acceptQueue.take(); + } catch (InterruptedException ie) { + continue; + } + if (serverSock.getInputStream() == null) // poison + throw new IOException("closed"); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Accepted " + _port); + break; + } + return serverSock; + } + + @Override + public String toString() { + return ("Internal server socket on port " + _port); + } + + /** + * This is how the client connects. + * + * Todo: Java 1.5 PipedInputStream buffers are only 1024 bytes; our I2CP messages are typically 1730 bytes, + * thus causing thread blockage before the whole message is transferred. + * We can specify buffer size in 1.6 but not in 1.5. + * Does wrapping the PipedOutputStreams in BufferedOutputStreams gain capacity? + * No? + */ + static void internalConnect(int port, InternalSocket clientSock) throws IOException { + InternalServerSocket iss = _sockets.get(Integer.valueOf(port)); + if (iss == null) + throw new IOException("No server for port: " + port); + PipedInputStream cis = new BigPipedInputStream(); + PipedInputStream sis = new BigPipedInputStream(); + PipedOutputStream cos = new PipedOutputStream(sis); + PipedOutputStream sos = new PipedOutputStream(cis); + clientSock.setInputStream(cis); + clientSock.setOutputStream(cos); + iss.queueConnection(new InternalSocket(sis, sos)); + } + + /** + * Until we switch to Java 1.6 + * http://javatechniques.com/blog/low-memory-deep-copy-technique-for-java-objects/ + */ + private static class BigPipedInputStream extends PipedInputStream { + protected static int PIPE_SIZE = 64*1024; + public BigPipedInputStream() { + super(); + buffer = new byte[PIPE_SIZE]; + } + } + + private void queueConnection(InternalSocket sock) throws IOException { + if (!_running) + throw new IOException("Server closed for port: " + _port); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Queueing " + _port); + try { + _acceptQueue.put(sock); + } catch (InterruptedException ie) {} + } + + @Override + public int getLocalPort() { + return _port.intValue(); + } + + // ignored stuff + + /** warning - unsupported */ + @Override + public void setSoTimeout(int timeout) {} + + @Override + public int getSoTimeout () { + return 0; + } + + // everything below here unsupported + /** @deprecated unsupported */ + @Override + public void bind(SocketAddress endpoint) { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public void bind(SocketAddress endpoint, int backlog) { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public ServerSocketChannel getChannel() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public InetAddress getInetAddress() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public SocketAddress getLocalSocketAddress() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public int getReceiveBufferSize() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public boolean getReuseAddress() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public boolean isBound() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public boolean isClosed() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public void setReceiveBufferSize(int size) { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public void setReuseAddress(boolean on) { + throw new IllegalArgumentException("unsupported"); + } +} diff --git a/core/java/src/net/i2p/util/InternalSocket.java b/core/java/src/net/i2p/util/InternalSocket.java new file mode 100644 index 000000000..b1feb847f --- /dev/null +++ b/core/java/src/net/i2p/util/InternalSocket.java @@ -0,0 +1,259 @@ +package net.i2p.util; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.InetAddress; +import java.net.Socket; +import java.net.SocketAddress; +import java.nio.channels.SocketChannel; + +/** + * A simple in-JVM Socket using Piped Streams. + * We use port numbers just like regular sockets. + * Can only connect to InternalServerSocket. + */ +public class InternalSocket extends Socket { + private InputStream _is; + private OutputStream _os; + + /** server side */ + InternalSocket(InputStream is, OutputStream os) { + _is = is; + _os = os; + } + + /** client side */ + public InternalSocket(int port) throws IOException { + if (port <= 0) + throw new IOException("bad port number"); + InternalServerSocket.internalConnect(port, this); + } + + /** + * Convenience method to return either a Socket or an InternalSocket + */ + public static Socket getSocket(String host, int port) throws IOException { + if (System.getProperty("router.version") != null && + (host.equals("127.0.0.1") || host.equals("localhost"))) { + return new InternalSocket(port); + } else { + return new Socket(host, port); + } + } + + @Override + public InputStream getInputStream() { + return _is; + } + + @Override + public OutputStream getOutputStream() { + return _os; + } + + void setInputStream(InputStream is) { + _is = is; + } + + void setOutputStream(OutputStream os) { + _os = os; + } + + @Override + public void close() { + try { + if (_is != null) _is.close(); + } catch (IOException ie) {} + try { + if (_os != null) _os.close(); + } catch (IOException ie) {} + } + + @Override + public String toString() { + return ("Internal socket"); + } + + // ignored stuff + /** warning - unsupported */ + @Override + public void setSoTimeout(int timeout) {} + + @Override + public int getSoTimeout () { + return 0; + } + + // everything below here unsupported + /** @deprecated unsupported */ + @Override + public void bind(SocketAddress endpoint) { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public void connect(SocketAddress endpoint) { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public void connect(SocketAddress endpoint, int timeout) { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public SocketChannel getChannel() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public InetAddress getInetAddress() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public boolean getKeepAlive() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public InetAddress getLocalAddress() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public int getLocalPort() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public SocketAddress getLocalSocketAddress() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public boolean getOOBInline() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public int getPort() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public int getReceiveBufferSize() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public SocketAddress getRemoteSocketAddress() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public boolean getReuseAddress() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public int getSendBufferSize() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public int getSoLinger() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public boolean getTcpNoDelay() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public int getTrafficClass() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public boolean isBound() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public boolean isClosed() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public boolean isConnected() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public boolean isInputShutdown() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public boolean isOutputShutdown() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public void sendUrgentData(int data) { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public void setKeepAlive(boolean on) { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public void setOOBInline(boolean on) { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public void setReceiveBufferSize(int size) { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public void setReuseAddress(boolean on) { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public void setSendBufferSize(int size) { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public void setSoLinger(boolean on, int linger) { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public void setTcpNoDelay(boolean on) { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public void setTrafficClass(int cize) { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public void shutdownInput() { + throw new IllegalArgumentException("unsupported"); + } + /** @deprecated unsupported */ + @Override + public void shutdownOutput() { + throw new IllegalArgumentException("unsupported"); + } +} diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java index 3e9a6cc66..7e231097b 100644 --- a/router/java/src/net/i2p/router/Router.java +++ b/router/java/src/net/i2p/router/Router.java @@ -200,6 +200,9 @@ public class Router { // overwrite an existing running router's jar files. Other than ours. installUpdates(); + // Apps may use this as an easy way to determine if they are in the router JVM + System.setProperty("router.version", RouterVersion.VERSION); + // NOW we start all the activity _context.initAll(); diff --git a/router/java/src/net/i2p/router/client/ClientListenerRunner.java b/router/java/src/net/i2p/router/client/ClientListenerRunner.java index 0f26b8d00..e5e6d8443 100644 --- a/router/java/src/net/i2p/router/client/ClientListenerRunner.java +++ b/router/java/src/net/i2p/router/client/ClientListenerRunner.java @@ -24,14 +24,14 @@ import net.i2p.util.Log; * @author jrandom */ public class ClientListenerRunner implements Runnable { - private Log _log; - private RouterContext _context; - private ClientManager _manager; - private ServerSocket _socket; - private int _port; + protected Log _log; + protected RouterContext _context; + protected ClientManager _manager; + protected ServerSocket _socket; + protected int _port; private boolean _bindAllInterfaces; - private boolean _running; - private boolean _listening; + protected boolean _running; + protected boolean _listening; public static final String BIND_ALL_INTERFACES = "i2cp.tcp.bindAllInterfaces"; @@ -91,7 +91,9 @@ public class ClientListenerRunner implements Runnable { } else { if (_log.shouldLog(Log.WARN)) _log.warn("Refused connection from " + socket.getInetAddress()); - socket.close(); + try { + socket.close(); + } catch (IOException ioe) {} } } catch (IOException ioe) { if (_context.router().isAlive()) @@ -132,7 +134,7 @@ public class ClientListenerRunner implements Runnable { /** give the i2cp client 5 seconds to show that they're really i2cp clients */ private final static int CONNECT_TIMEOUT = 5*1000; - private boolean validate(Socket socket) { + protected boolean validate(Socket socket) { try { socket.setSoTimeout(CONNECT_TIMEOUT); int read = socket.getInputStream().read(); @@ -150,7 +152,7 @@ public class ClientListenerRunner implements Runnable { * Handle the connection by passing it off to a {@link ClientConnectionRunner ClientConnectionRunner} * */ - protected void runConnection(Socket socket) throws IOException { + protected void runConnection(Socket socket) { ClientConnectionRunner runner = new ClientConnectionRunner(_context, _manager, socket); _manager.registerConnection(runner); } diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java index cbc5d778b..4e77bbf9f 100644 --- a/router/java/src/net/i2p/router/client/ClientManager.java +++ b/router/java/src/net/i2p/router/client/ClientManager.java @@ -42,6 +42,7 @@ import net.i2p.util.Log; public class ClientManager { private Log _log; private ClientListenerRunner _listener; + private ClientListenerRunner _internalListener; private final HashMap _runners; // Destination --> ClientConnectionRunner private final Set _pendingRunners; // ClientConnectionRunner for clients w/out a Dest yet private RouterContext _ctx; @@ -58,11 +59,21 @@ public class ClientManager { new long[] { 60*1000l, 60*60*1000l, 24*60*60*1000l }); _runners = new HashMap(); _pendingRunners = new HashSet(); + startListeners(port); + } + + /** Todo: Start a 3rd listener for IPV6? */ + private void startListeners(int port) { _listener = new ClientListenerRunner(_ctx, this, port); Thread t = new I2PThread(_listener); t.setName("ClientListener:" + port); t.setDaemon(true); t.start(); + _internalListener = new InternalClientListenerRunner(_ctx, this, port); + t = new I2PThread(_internalListener); + t.setName("ClientListener:" + port + "-i"); + t.setDaemon(true); + t.start(); } public void restart() { @@ -80,16 +91,13 @@ public class ClientManager { _log.error("Error setting the port: " + portStr + " is not valid", nfe); } } - _listener = new ClientListenerRunner(_ctx, this, port); - Thread t = new I2PThread(_listener); - t.setName("ClientListener:" + port); - t.setDaemon(true); - t.start(); + startListeners(port); } public void shutdown() { _log.info("Shutting down the ClientManager"); _listener.stopListening(); + _internalListener.stopListening(); Set runners = new HashSet(); synchronized (_runners) { for (Iterator iter = _runners.values().iterator(); iter.hasNext();) { diff --git a/router/java/src/net/i2p/router/client/InternalClientListenerRunner.java b/router/java/src/net/i2p/router/client/InternalClientListenerRunner.java new file mode 100644 index 000000000..2105f7691 --- /dev/null +++ b/router/java/src/net/i2p/router/client/InternalClientListenerRunner.java @@ -0,0 +1,88 @@ +package net.i2p.router.client; +/* + * free (adj.): unencumbered; not under the control of others + * Written by jrandom in 2003 and released into the public domain + * with no warranty of any kind, either expressed or implied. + * It probably won't make your computer catch on fire, or eat + * your children, but it might. Use at your own risk. + * + */ + +import java.io.IOException; +import java.net.Socket; + +import net.i2p.router.RouterContext; +import net.i2p.util.Log; +import net.i2p.util.InternalServerSocket; + +/** + * Listen for in-JVM connections on the internal "socket" + * + * @author zzz + */ +public class InternalClientListenerRunner extends ClientListenerRunner { + + public InternalClientListenerRunner(RouterContext context, ClientManager manager, int port) { + super(context, manager, port); + _log = _context.logManager().getLog(InternalClientListenerRunner.class); + } + + /** + * Start up the socket listener, listens for connections, and + * fires those connections off via {@link #runConnection runConnection}. + * This only returns if the socket cannot be opened or there is a catastrophic + * failure. + * + */ + public void runServer() { + try { + if (_log.shouldLog(Log.INFO)) + _log.info("Listening on internal port " + _port); + _socket = new InternalServerSocket(_port); + + if (_log.shouldLog(Log.DEBUG)) + _log.debug("InternalServerSocket created, before accept: " + _socket); + + _listening = true; + _running = true; + while (_running) { + try { + Socket socket = _socket.accept(); + if (validate(socket)) { + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Internal connection received"); + runConnection(socket); + } else { + if (_log.shouldLog(Log.WARN)) + _log.warn("Refused connection from " + socket.getInetAddress()); + try { + socket.close(); + } catch (IOException ioe) {} + } + } catch (IOException ioe) { + if (_context.router().isAlive()) + _log.error("Server error accepting", ioe); + } catch (Throwable t) { + if (_context.router().isAlive()) + _log.error("Fatal error running client listener - killing the thread!", t); + _listening = false; + return; + } + } + } catch (IOException ioe) { + if (_context.router().isAlive()) + _log.error("Error listening on internal port " + _port, ioe); + } + + _listening = false; + if (_socket != null) { + try { _socket.close(); } catch (IOException ioe) {} + _socket = null; + } + + + if (_context.router().isAlive()) + _log.error("CANCELING I2CP LISTEN", new Exception("I2CP Listen cancelled!!!")); + _running = false; + } +} From 43029de2f368262256e2bd4e800cb5fb27617470 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 4 Dec 2009 00:22:12 +0000 Subject: [PATCH 026/127] point to translated pages on www.i2p2.i2p --- installer/resources/readme/readme_fr.html | 6 +++--- installer/resources/readme/readme_zh.html | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/installer/resources/readme/readme_fr.html b/installer/resources/readme/readme_fr.html index a95ffe266..a3d38072c 100644 --- a/installer/resources/readme/readme_fr.html +++ b/installer/resources/readme/readme_fr.html @@ -9,8 +9,8 @@
  • inproxy.tino.i2p et perv.i2p: listent les eepsites actifs
  • forum.i2p: une connection sécurisée et anonyme vers forum.i2p2.de
    • -
  • www.i2p2.i2p et le miroir i2p-projekt.i2p: - connections sécurisées et anonyme vers www.i2p2.de
    • +
  • www.i2p2.i2p et le miroir i2p-projekt.i2p: + connections sécurisées et anonyme vers www.i2p2.de
  • eepsites.i2p: un moteur de recherche d'eepsites
  • ugha.i2p: l'eepsite d'ugha, un wiki que chaucun peut éditer ainsi que
  • fproxy.tino.i2p: un proxy Freenet 0.5
    • @@ -38,4 +38,4 @@

    Dépannage

    -

    Soyez patient - i2p peut s'avérer lent à démarrer la première fois car il recherche des pairs. Si, après 30 minutes, votre Actives: connecté/récent compte moins de 10 pairs connectés, vous devez ouvrir le port 8887 sur votre pare-feu pour avoir une meilleure connection. Si vous ne pouvez accéder à aucun eepsite (même www.i2p2.i2p), soyez sûr que votre navigateur utilise bien le proxy 127.0.0.1 sur le port 4444. Vous pouvez aussi faire part de votre démarche sur le site web I2P, poster des message sur le forum de discussion, ou passer par #i2p ou #i2p-chat sur IRC sur le serveur irc.freenode.net, irc.postman.i2p ou irc.freshcoffee.i2p (ils sont liés).

    +

    Soyez patient - i2p peut s'avérer lent à démarrer la première fois car il recherche des pairs. Si, après 30 minutes, votre Actives: connecté/récent compte moins de 10 pairs connectés, vous devez ouvrir le port 8887 sur votre pare-feu pour avoir une meilleure connection. Si vous ne pouvez accéder à aucun eepsite (même www.i2p2.i2p), soyez sûr que votre navigateur utilise bien le proxy 127.0.0.1 sur le port 4444. Vous pouvez aussi faire part de votre démarche sur le site web I2P, poster des message sur le forum de discussion, ou passer par #i2p ou #i2p-chat sur IRC sur le serveur irc.freenode.net, irc.postman.i2p ou irc.freshcoffee.i2p (ils sont liés).

    diff --git a/installer/resources/readme/readme_zh.html b/installer/resources/readme/readme_zh.html index d3cf05a77..2ebf15bde 100644 --- a/installer/resources/readme/readme_zh.html +++ b/installer/resources/readme/readme_zh.html @@ -12,7 +12,7 @@
  • 浏览 I2P 站点 "eepsites" - I2P 网络内匿名运行的小站 - 您要首先设置浏览器的 HTTP 代理 为 127.0.0.1:4444， 然后才能浏览 I2P 站点 -
    • inproxy.tino.i2p 和 perv.i2p: 这两个站点用于跟踪哪些 I2P 站点在线。
    • forum.i2p:I2P官方论坛 forum.i2p2.de 的匿名入口 (个人的I2P站点会在论坛的EEPSITE讨论区发布)
      • -
    • www.i2p2.i2p 与镜像 i2p-projekt.i2p: 可以安全匿名的访问I2P官网 www.i2p2.de
      • +
    • www.i2p2.i2p 与镜像 i2p-projekt.i2p: 可以安全匿名的访问I2P官网 www.i2p2.de
    • eepsites.i2p: I2P网络里的 “Google” 可以用来搜索各个匿名小站
    • ugha.i2p:UGHA 的 I2P 小站，任何人都可以编辑的WIKI，有丰富的链接
    • fproxy.tino.i2p:FREENET 代理
      • @@ -34,4 +34,4 @@

      疑难解答

      -

      保持耐心 - I2P 第一次启动时需要搜索节点，可能比较缓慢。如果30分钟后，您的活动节点计数仍在 10 个节点以下, 请在防火墙中打开 8887 端口改善连接性能。如果您根本无法打开任何EEPSITE(甚至 www.i2p2.i2p)，检查您的浏览器代理设置是否为本地的 127.0.0.1:4444。你也可以到 I2P 网站 查找信息, 在 I2P 论坛 中发帖, 来 irc.freenode.net , irc.postman.i2p 或 irc.freshcoffee.i2p 上的 #i2p 或 #i2p-chat 这两个 IRC 频道上询问。 (这些服务器上的这两个频道是相通的)。

      \ No newline at end of file +

      保持耐心 - I2P 第一次启动时需要搜索节点，可能比较缓慢。如果30分钟后，您的活动节点计数仍在 10 个节点以下, 请在防火墙中打开 8887 端口改善连接性能。如果您根本无法打开任何EEPSITE(甚至 www.i2p2.i2p)，检查您的浏览器代理设置是否为本地的 127.0.0.1:4444。你也可以到 I2P 网站 查找信息, 在 I2P 论坛 中发帖, 来 irc.freenode.net , irc.postman.i2p 或 irc.freshcoffee.i2p 上的 #i2p 或 #i2p-chat 这两个 IRC 频道上询问。 (这些服务器上的这两个频道是相通的)。

      From c4e6148b9f9c040fc7080499bbac40b9f19e7e35 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 4 Dec 2009 00:22:46 +0000 Subject: [PATCH 027/127] config cleanup, more HTML transitional fixes --- .../org/klomp/snark/web/I2PSnarkServlet.java | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index a4ac23b43..ed00d1244 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -659,12 +659,12 @@ public class I2PSnarkServlet extends HttpServlet { out.write("\n"); // *not* enctype="multipart/form-data", so that the input type=file sends the filename, not the file out.write("
      \n"); - out.write("\n"); - out.write("
      Add Torrent:
      \n"); - out.write("From URL : \n"); + out.write("\n"); + out.write("
      Add Torrent
      \n"); + out.write("From URL : \n"); // not supporting from file at the moment, since the file name passed isn't always absolute (so it may not resolve) //out.write("From file:
      \n"); - out.write("
      \n"); + out.write("
      \n"); out.write("Alternately, you can copy .torrent files to " + _manager.getDataDir().getAbsolutePath() + "
      \n"); out.write("Removing that .torrent file will cause the torrent to stop.
      \n"); out.write("\n
      "); @@ -679,12 +679,12 @@ public class I2PSnarkServlet extends HttpServlet { out.write("
      \n"); // *not* enctype="multipart/form-data", so that the input type=file sends the filename, not the file out.write("
      \n"); - out.write("\n"); - out.write("Create Torrent:
      \n"); + out.write("\n"); + out.write("Create Torrent
      \n"); //out.write("From file:
      \n"); out.write("Data to seed: " + _manager.getDataDir().getAbsolutePath() + File.separatorChar + "
      \n"); + + "\" title=\"File to seed (must be within the specified path)\" >
      \n"); out.write("Tracker: \n"); out.write("or "); - out.write("\n"); + "title=\"Custom tracker URL\" > "); + out.write("\n"); out.write("
      \n
      "); } @@ -713,13 +713,13 @@ public class I2PSnarkServlet extends HttpServlet { out.write("
      \n"); out.write("
      \n"); - out.write("\n"); - out.write("Configuration:
      \n"); - out.write("Data directory: (Edit i2psnark.config and restart to change)
      \n"); - out.write("Auto start: \n"); + out.write("Configuration
      \n"); + out.write("
      Data directory:
      (Edit i2psnark.config and restart to change)
      \n"); + out.write("
      Auto start: "); + + "title=\"If true, automatically start torrents that are added\" >"); //Auto add: //Auto stop: //out.write("
      \n"); @@ -739,26 +739,26 @@ public class I2PSnarkServlet extends HttpServlet { out.write("\n\t"); out.write("
      \n"); */ - out.write("Total uploader limit: peers
      \n"); - out.write("Up bandwidth limit: KBps (Half available bandwidth recommended.)
      \n"); + out.write("
      Total uploader limit: peers
      \n"); + out.write("
      Up bandwidth limit: KBps (Half available bandwidth recommended.)
      \n"); - out.write("Use open trackers also:       		Use open trackers also: "); - out.write("Announce URLs:
      \n"); + + "title=\"If true, uses open trackers in addition\" > "); + out.write("
      Open tracker announce URLs:
      \n"); //out.write("\n"); //out.write("EepProxy host: "); //out.write("port:
      \n"); - out.write("I2CP host: "); - out.write("port:
      \n"); + out.write("
      I2CP host: "); + out.write("
      I2CP port:
      \n"); StringBuilder opts = new StringBuilder(64); Map options = new TreeMap(_manager.util().getI2CPOptions()); for (Iterator iter = options.entrySet().iterator(); iter.hasNext(); ) { @@ -767,10 +767,10 @@ public class I2PSnarkServlet extends HttpServlet { String val = (String)entry.getValue(); opts.append(key).append('=').append(val).append(' '); } - out.write("I2CP opts:
      \n"); - out.write("\n"); - out.write("\n"); + out.write("
      I2CP options:
      \n"); + out.write("
       \n"); + out.write("
      \n"); out.write("
      "); } @@ -790,7 +790,7 @@ public class I2PSnarkServlet extends HttpServlet { "\n" + "I2PSnark - Anonymous BitTorrent Client\n"; - private static final String HEADER = ""; + private static final String HEADER = ""; private static final String TABLE_HEADER = "\n" + From f5c1acc749447541430fb1508c2461e905c17644 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 4 Dec 2009 00:27:05 +0000 Subject: [PATCH 028/127] Fix potential XSS holes --- .../java/src/net/i2p/router/web/NetDbHelper.java | 6 +++++- apps/routerconsole/jsp/configpeer.jsp | 2 +- apps/routerconsole/jsp/i2ptunnel/index.jsp | 2 +- .../src/java/src/i2p/susi/dns/AddressbookBean.java | 8 +++++--- history.txt | 5 +++++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java index ef61f0663..2e97b957e 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java @@ -4,6 +4,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; +import net.i2p.data.DataHelper; public class NetDbHelper extends HelperBase { private String _routerPrefix; @@ -12,7 +13,10 @@ public class NetDbHelper extends HelperBase { public NetDbHelper() {} - public void setRouter(String r) { _routerPrefix = r; } + public void setRouter(String r) { + _routerPrefix = DataHelper.stripHTML(r); // XSS + } + public void setFull(String f) { try { _full = Integer.parseInt(f); diff --git a/apps/routerconsole/jsp/configpeer.jsp b/apps/routerconsole/jsp/configpeer.jsp index 8b61f274d..bd5390108 100644 --- a/apps/routerconsole/jsp/configpeer.jsp +++ b/apps/routerconsole/jsp/configpeer.jsp @@ -24,7 +24,7 @@ <% String peer = ""; if (request.getParameter("peer") != null) - peer = request.getParameter("peer"); + peer = net.i2p.data.DataHelper.stripHTML(request.getParameter("peer")); // XSS %>
      diff --git a/apps/routerconsole/jsp/i2ptunnel/index.jsp b/apps/routerconsole/jsp/i2ptunnel/index.jsp index 8c7eefc2e..f3cceda0d 100644 --- a/apps/routerconsole/jsp/i2ptunnel/index.jsp +++ b/apps/routerconsole/jsp/i2ptunnel/index.jsp @@ -3,5 +3,5 @@ -The I2P Tunnel Manager is not currently running. Please visit theClient Configuration page to start it. +The I2P Tunnel Manager is not currently running. Please visit the Client Configuration page to start it. diff --git a/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java b/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java index a5dcf86cf..4036462bd 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java @@ -35,6 +35,8 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.Properties; +import net.i2p.data.DataHelper; + public class AddressbookBean { private String book, action, serial, lastSerial, filter, search, hostname, destination; @@ -140,7 +142,7 @@ public class AddressbookBean return book; } public void setBook(String book) { - this.book = book; + this.book = DataHelper.stripHTML(book); // XSS } public String getSerial() { lastSerial = "" + Math.random(); @@ -326,7 +328,7 @@ public class AddressbookBean return destination; } public void setDestination(String destination) { - this.destination = destination; + this.destination = DataHelper.stripHTML(destination); // XSS } public String getHostname() { return hostname; @@ -338,7 +340,7 @@ public class AddressbookBean deletionMarks.addLast( name ); } public void setHostname(String hostname) { - this.hostname = hostname; + this.hostname = DataHelper.stripHTML(hostname); // XSS } private int getBeginInt() { return Math.max(0, Math.min(entries.length - 1, beginIndex)); diff --git a/history.txt b/history.txt index 62af66cba..ce9463465 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,8 @@ +2009-12-04 zzz + * Console: Close up some possible XSS (thanks Pragmatk) + * i2psnark: Config cleanup, more HTML transitional fixes + * readme*.html: Point to translated pages on www.i2p2.i2p + 2009-11-29 zzz * config.jsp: Comment out unused stuff better * profiles.jsp: Hide non-ff from ff table diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 458d45df4..b2865c3c1 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 24; + public final static long BUILD = 25; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; From bda4eb830e98ef3506c80ce190aade76fd05a015 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 4 Dec 2009 11:16:43 +0000 Subject: [PATCH 029/127] prevent accept() hang on internal socket --- .../router/client/ClientListenerRunner.java | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/router/java/src/net/i2p/router/client/ClientListenerRunner.java b/router/java/src/net/i2p/router/client/ClientListenerRunner.java index e5e6d8443..2c96fa487 100644 --- a/router/java/src/net/i2p/router/client/ClientListenerRunner.java +++ b/router/java/src/net/i2p/router/client/ClientListenerRunner.java @@ -9,6 +9,7 @@ package net.i2p.router.client; */ import java.io.IOException; +import java.io.InputStream; import java.net.InetAddress; import java.net.ServerSocket; import java.net.Socket; @@ -133,20 +134,24 @@ public class ClientListenerRunner implements Runnable { /** give the i2cp client 5 seconds to show that they're really i2cp clients */ private final static int CONNECT_TIMEOUT = 5*1000; - + + /** + * Verify the first byte. + * The InternalSocket doesn't support SoTimeout, so use available() + * instead to prevent hanging. + */ protected boolean validate(Socket socket) { try { - socket.setSoTimeout(CONNECT_TIMEOUT); - int read = socket.getInputStream().read(); - if (read != I2PClient.PROTOCOL_BYTE) - return false; - socket.setSoTimeout(0); - return true; - } catch (IOException ioe) { - if (_log.shouldLog(Log.WARN)) - _log.warn("Peer did not authenticate themselves as I2CP quickly enough, dropping"); - return false; - } + InputStream is = socket.getInputStream(); + for (int i = 0; i < 20; i++) { + if (is.available() > 0) + return is.read() == I2PClient.PROTOCOL_BYTE; + try { Thread.sleep(250); } catch (InterruptedException ie) {} + } + } catch (IOException ioe) {} + if (_log.shouldLog(Log.WARN)) + _log.warn("Peer did not authenticate themselves as I2CP quickly enough, dropping"); + return false; } /** * Handle the connection by passing it off to a {@link ClientConnectionRunner ClientConnectionRunner} From c88c905926d79ef44a148673f7e2178d6c9068cf Mon Sep 17 00:00:00 2001 From: neutron Date: Fri, 4 Dec 2009 21:27:59 +0000 Subject: [PATCH 030/127] rev --- apps/routerconsole/locale/messages_fr.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/routerconsole/locale/messages_fr.po b/apps/routerconsole/locale/messages_fr.po index 30b2c3cac..a60847336 100644 --- a/apps/routerconsole/locale/messages_fr.po +++ b/apps/routerconsole/locale/messages_fr.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: I2P routerconsole\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-11-01 02:59+0000\n" -"PO-Revision-Date: 2009-11-30 21:35+0100\n" +"PO-Revision-Date: 2009-12-04 22:22+0100\n" "Last-Translator: \n" "Language-Team: foo \n" "MIME-Version: 1.0\n" @@ -2319,7 +2319,7 @@ msgstr "L'identité unique de votre routeur est" #: src/net/i2p/router/web/SummaryBarRenderer.java:143 msgid "never reveal it to anyone" -msgstr "révéler jamais à personne" +msgstr "ne jamais la révéler à personne" #: src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Local Identity" @@ -2379,15 +2379,15 @@ msgstr "" #: src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "Bandwidth in/out" -msgstr "Bande passante entrant/sortant" +msgstr "Bande passante entrante/sortante" #: src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Total" -msgstr "" +msgstr "Totale" #: src/net/i2p/router/web/SummaryBarRenderer.java:336 msgid "Used" -msgstr "Utilisé" +msgstr "Utilisée" #: src/net/i2p/router/web/SummaryBarRenderer.java:346 msgid "Tunnels in/out" From 978cd2c484bd68157da05366bb0dbbd07886ac29 Mon Sep 17 00:00:00 2001 From: sponge Date: Sat, 5 Dec 2009 13:26:40 +0000 Subject: [PATCH 031/127] * BOB: fix a critical bug causing ghosts on probes and remove unused code. --- apps/BOB/src/net/i2p/BOB/DoCMDS.java | 2 +- apps/BOB/src/net/i2p/BOB/I2Plistener.java | 58 +++++++------------ apps/BOB/src/net/i2p/BOB/MUXlisten.java | 4 +- apps/BOB/src/net/i2p/BOB/TCPlistener.java | 49 ++++++---------- history.txt | 4 ++ .../src/net/i2p/router/RouterVersion.java | 2 +- 6 files changed, 47 insertions(+), 72 deletions(-) diff --git a/apps/BOB/src/net/i2p/BOB/DoCMDS.java b/apps/BOB/src/net/i2p/BOB/DoCMDS.java index 14c83c4ba..dcb0a195d 100644 --- a/apps/BOB/src/net/i2p/BOB/DoCMDS.java +++ b/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 = "09", BEXT = ""; + public static final String BMAJ = "00", BMIN = "00", BREV = "0A", BEXT = ""; public static final String BOBversion = BMAJ + "." + BMIN + "." + BREV + BEXT; private Socket server; private Properties props; diff --git a/apps/BOB/src/net/i2p/BOB/I2Plistener.java b/apps/BOB/src/net/i2p/BOB/I2Plistener.java index e55e54b9d..fc6dde603 100644 --- a/apps/BOB/src/net/i2p/BOB/I2Plistener.java +++ b/apps/BOB/src/net/i2p/BOB/I2Plistener.java @@ -60,20 +60,9 @@ public class I2Plistener implements Runnable { this._log = _log; this.socketManager = S; this.serverSocket = SS; -// tgwatch = 1; this.lives = lives; } - private void rlock() throws Exception { - database.getReadLock(); - info.getReadLock(); - } - - private void runlock() throws Exception { - database.releaseReadLock(); - info.releaseReadLock(); - } - /** * Simply listen on I2P port, and thread connections * @@ -83,34 +72,31 @@ public class I2Plistener implements Runnable { I2PSocket sessSocket = null; int conn = 0; try { - die: - { - try { - serverSocket.setSoTimeout(50); - - while (lives.get()) { - try { - sessSocket = serverSocket.accept(); - g = true; - } catch (ConnectException ce) { - g = false; - } catch (SocketTimeoutException ste) { - g = false; - } - if (g) { - g = false; - conn++; - // toss the connection to a new thread. - I2PtoTCP conn_c = new I2PtoTCP(sessSocket, info, database, lives); - Thread t = new Thread(conn_c, Thread.currentThread().getName() + " I2PtoTCP " + conn); - t.start(); - } + try { + serverSocket.setSoTimeout(50); + while (lives.get()) { + try { + sessSocket = serverSocket.accept(); + g = true; + } catch (ConnectException ce) { + g = false; + } catch (SocketTimeoutException ste) { + g = false; } - } catch (I2PException e) { - // bad shit - System.out.println("Exception " + e); + if (g) { + g = false; + conn++; + // toss the connection to a new thread. + I2PtoTCP conn_c = new I2PtoTCP(sessSocket, info, database, lives); + Thread t = new Thread(conn_c, Thread.currentThread().getName() + " I2PtoTCP " + conn); + t.start(); + } + } + } catch (I2PException e) { + // bad shit + System.out.println("Exception " + e); } } finally { try { diff --git a/apps/BOB/src/net/i2p/BOB/MUXlisten.java b/apps/BOB/src/net/i2p/BOB/MUXlisten.java index c91a8743c..671fffa95 100644 --- a/apps/BOB/src/net/i2p/BOB/MUXlisten.java +++ b/apps/BOB/src/net/i2p/BOB/MUXlisten.java @@ -104,10 +104,10 @@ public class MUXlisten implements Runnable { this.database.releaseReadLock(); this.info.releaseReadLock(); - socketManager = I2PSocketManagerFactory.createManager(prikey, Q); if (this.come_in) { this.listener = new ServerSocket(port, backlog, host); } + socketManager = I2PSocketManagerFactory.createManager(prikey, Q); // I2PException, IOException, RuntimeException // To bad we can't just catch and enumerate.... // } catch (I2PException e) { @@ -141,8 +141,6 @@ public class MUXlisten implements Runnable { this.info.add("STARTING", new Boolean(false)); this.info.releaseWriteLock(); this.database.releaseWriteLock(); - // throw new Exception(e); - // Debugging, I guess. e.printStackTrace(); throw new RuntimeException(e); } diff --git a/apps/BOB/src/net/i2p/BOB/TCPlistener.java b/apps/BOB/src/net/i2p/BOB/TCPlistener.java index b5addc27b..714ee1e7f 100644 --- a/apps/BOB/src/net/i2p/BOB/TCPlistener.java +++ b/apps/BOB/src/net/i2p/BOB/TCPlistener.java @@ -64,16 +64,6 @@ public class TCPlistener implements Runnable { this.lives = lives; } - private void rlock() throws Exception { - database.getReadLock(); - info.getReadLock(); - } - - private void runlock() throws Exception { - database.releaseReadLock(); - info.releaseReadLock(); - } - /** * Simply listen on TCP port, and thread connections * @@ -81,30 +71,27 @@ public class TCPlistener implements Runnable { public void run() { boolean g = false; int conn = 0; + Socket server = null; try { - die: - { - try { - Socket server = new Socket(); - listener.setSoTimeout(50); // We don't block, we cycle and check. - while (lives.get()) { - try { - server = listener.accept(); - g = true; - } catch (SocketTimeoutException ste) { - g = false; - } - if (g) { - conn++; - // toss the connection to a new thread. - TCPtoI2P conn_c = new TCPtoI2P(socketManager, server, info, database, lives); - Thread t = new Thread(conn_c, Thread.currentThread().getName() + " TCPtoI2P " + conn); - t.start(); - g = false; - } + try { + listener.setSoTimeout(50); // We don't block, we cycle and check. + while (lives.get()) { + try { + server = listener.accept(); + g = true; + } catch (SocketTimeoutException ste) { + g = false; + } + if (g) { + conn++; + // toss the connection to a new thread. + TCPtoI2P conn_c = new TCPtoI2P(socketManager, server, info, database, lives); + Thread t = new Thread(conn_c, Thread.currentThread().getName() + " TCPtoI2P " + conn); + t.start(); + g = false; } - } catch (IOException ioe) { } + } catch (IOException ioe) { } } finally { try { diff --git a/history.txt b/history.txt index ce9463465..01e2e6617 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +2009-12-05 sponge + * BOB: fix a critical bug causing ghosts on probes + and remove unused code. + 2009-12-04 zzz * Console: Close up some possible XSS (thanks Pragmatk) * i2psnark: Config cleanup, more HTML transitional fixes diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index b2865c3c1..f55bf0ab2 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 25; + public final static long BUILD = 26; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; From 891416e6b9a78dc673571f3dc648aa974c835840 Mon Sep 17 00:00:00 2001 From: russiansponsor Date: Sat, 5 Dec 2009 16:47:02 +0000 Subject: [PATCH 032/127] Added Russian localization files --- apps/routerconsole/locale/messages_ru.po | 3918 +++++++++++++++++++++ installer/resources/readme/readme_ru.html | 86 + 2 files changed, 4004 insertions(+) create mode 100644 apps/routerconsole/locale/messages_ru.po create mode 100644 installer/resources/readme/readme_ru.html diff --git a/apps/routerconsole/locale/messages_ru.po b/apps/routerconsole/locale/messages_ru.po new file mode 100644 index 000000000..d537ed8d6 --- /dev/null +++ b/apps/routerconsole/locale/messages_ru.po @@ -0,0 +1,3918 @@ +# I2P +# Copyright (C) 2009 The I2P Project +# This file is distributed under the same license as the routerconsole package. +# To contribute translations, see http://www.i2p2.de/newdevelopers +# foo , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: I2P routerconsole\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-05 12:45+0000\n" +"PO-Revision-Date: 2009-12-05 18:36+0300\n" +"Last-Translator: Russian Sponsor \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Russian\n" + +#: ../../../router/java/src/net/i2p/router/Blocklist.java:117 +#, java-format +msgid "Banned by router hash: {0}" +msgstr "Banned by router hash: {0}" + +#: ../../../router/java/src/net/i2p/router/Blocklist.java:119 +msgid "Banned by router hash" +msgstr "Забанен маршрутизатора хэш" + +#: ../../../router/java/src/net/i2p/router/Blocklist.java:664 +msgid "IP banned" +msgstr "IP banned" + +#: ../../../router/java/src/net/i2p/router/Blocklist.java:734 +#, java-format +msgid "IP banned by blocklist.txt entry {0}" +msgstr "IP запрещен в blocklist.txt этой записей {0}" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:91 +msgid "Rejecting tunnels: Shutting down" +msgstr "Отвергая туннели: Выключение" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:140 +msgid "Rejecting tunnels: High message delay" +msgstr "Отвергая туннели: Высокая сообщения задержка" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:176 +msgid "Rejecting most tunnels: High number of requests" +msgstr "Отвергая большинстве туннелей: Высокое число запросов" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:232 +msgid "Rejecting tunnels: Limit reached" +msgstr "Отвергая туннелей: дошел до предела" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:300 +msgid "Rejecting tunnels: Bandwidth limit" +msgstr "Отвергая туннели: ограничить пропускную способность" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:370 +msgid "Rejecting most tunnels: Bandwidth limit" +msgstr "Отвергая наиболее туннели: ограничить пропускную способность" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:374 +msgid "Accepting most tunnels" +msgstr "Принимая большинство туннели" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:376 +msgid "Accepting tunnels" +msgstr "Принимая туннелей" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:486 +msgid "Rejecting tunnels" +msgstr "Отвергая туннелей" + +#: ../../../router/java/src/net/i2p/router/transport/GetBidsJob.java:70 +msgid "No transports (hidden or starting up?)" +msgstr "Нет транспорты (скрытой или начинать?)" + +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:450 +msgid "Unreachable on any transport" +msgstr "Недоступные на любом транспорте" + +#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:373 +#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:578 +#, java-format +msgid "Excessive clock skew: {0}" +msgstr "Чрезмерное часы не совпадающие по времени: {0}" + +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:128 +msgid "Dropping tunnel requests: Too slow" +msgstr "Удаление туннель просит: слишком медленный" + +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:340 +msgid "Dropping tunnel requests: Overloaded" +msgstr "Удаление туннель просит: Перегруженный" + +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:499 +msgid "Rejecting tunnels: Request overload" +msgstr "Отвергая туннелей: Запрос перегрузки" + +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:524 +msgid "Rejecting tunnels: Connection limit" +msgstr "Отвергая туннелей: Подключение к пределу" + +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:725 +msgid "Dropping tunnel requests: High load" +msgstr "Удаление туннель просит: Высокие нагрузки" + +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:734 +msgid "Dropping tunnel requests: Queue time" +msgstr "Удаление туннель просит: Очередь время" + +#: ../java/build/Countries.java:3 +msgid "Andorra" +msgstr "Андорра" + +#: ../java/build/Countries.java:4 +msgid "United Arab Emirates" +msgstr "Объединенные Арабские Эмираты" + +#: ../java/build/Countries.java:5 +msgid "Afghanistan" +msgstr "Афганистан" + +#: ../java/build/Countries.java:6 +msgid "Antigua and Barbuda" +msgstr "Антигуа и Барбуда" + +#: ../java/build/Countries.java:7 +msgid "Anguilla" +msgstr "Ангилья" + +#: ../java/build/Countries.java:8 +msgid "Albania" +msgstr "Албания" + +#: ../java/build/Countries.java:9 +msgid "Armenia" +msgstr "Армения" + +#: ../java/build/Countries.java:10 +msgid "Netherlands Antilles" +msgstr "Нидерландские Антильские острова" + +#: ../java/build/Countries.java:11 +msgid "Angola" +msgstr "Ангола" + +#: ../java/build/Countries.java:12 +msgid "Antarctica" +msgstr "Антарктида" + +#: ../java/build/Countries.java:13 +msgid "Argentina" +msgstr "Аргентина" + +#: ../java/build/Countries.java:14 +msgid "American Samoa" +msgstr "Американское Самоа" + +#: ../java/build/Countries.java:15 +msgid "Austria" +msgstr "Австрия" + +#: ../java/build/Countries.java:16 +msgid "Australia" +msgstr "Австралия" + +#: ../java/build/Countries.java:17 +msgid "Aruba" +msgstr "Аруба" + +#: ../java/build/Countries.java:19 +msgid "Azerbaijan" +msgstr "Азербайджан" + +#: ../java/build/Countries.java:20 +msgid "Bosnia and Herzegovina" +msgstr "Босния и Герцеговина" + +#: ../java/build/Countries.java:21 +msgid "Barbados" +msgstr "Барбадос" + +#: ../java/build/Countries.java:22 +msgid "Bangladesh" +msgstr "Бангладеш" + +#: ../java/build/Countries.java:23 +msgid "Belgium" +msgstr "Бельгия" + +#: ../java/build/Countries.java:24 +msgid "Burkina Faso" +msgstr "Буркина-Фасо" + +#: ../java/build/Countries.java:25 +msgid "Bulgaria" +msgstr "Болгария" + +#: ../java/build/Countries.java:26 +msgid "Bahrain" +msgstr "Бахрейн" + +#: ../java/build/Countries.java:27 +msgid "Burundi" +msgstr "Бурунди" + +#: ../java/build/Countries.java:28 +msgid "Benin" +msgstr "Бенин" + +#: ../java/build/Countries.java:29 +msgid "Bermuda" +msgstr "Бермудские Острова" + +#: ../java/build/Countries.java:30 +msgid "Brunei Darussalam" +msgstr "Бруней-Даруссалам" + +#: ../java/build/Countries.java:31 +msgid "Bolivia" +msgstr "Боливия" + +#: ../java/build/Countries.java:32 +msgid "Brazil" +msgstr "Бразилия" + +#: ../java/build/Countries.java:33 +msgid "Bahamas" +msgstr "Багамские острова" + +#: ../java/build/Countries.java:34 +msgid "Bhutan" +msgstr "Бутан" + +#: ../java/build/Countries.java:35 +msgid "Bouvet Island" +msgstr "Остров Буве" + +#: ../java/build/Countries.java:36 +msgid "Botswana" +msgstr "Ботсвана" + +#: ../java/build/Countries.java:37 +msgid "Belarus" +msgstr "Беларусь" + +#: ../java/build/Countries.java:38 +msgid "Belize" +msgstr "" + +#: ../java/build/Countries.java:39 +msgid "Canada" +msgstr "" + +#: ../java/build/Countries.java:40 +msgid "The Democratic Republic of the Congo" +msgstr "" + +#: ../java/build/Countries.java:41 +msgid "Central African Republic" +msgstr "" + +#: ../java/build/Countries.java:42 +msgid "Congo" +msgstr "" + +#: ../java/build/Countries.java:43 +msgid "Switzerland" +msgstr "" + +#: ../java/build/Countries.java:44 +msgid "Cote D'Ivoire" +msgstr "" + +#: ../java/build/Countries.java:45 +msgid "Cook Islands" +msgstr "" + +#: ../java/build/Countries.java:46 +msgid "Chile" +msgstr "" + +#: ../java/build/Countries.java:47 +msgid "Cameroon" +msgstr "" + +#: ../java/build/Countries.java:48 +msgid "China" +msgstr "" + +#: ../java/build/Countries.java:49 +msgid "Colombia" +msgstr "" + +#: ../java/build/Countries.java:50 +msgid "Costa Rica" +msgstr "" + +#: ../java/build/Countries.java:51 +msgid "Serbia and Montenegro" +msgstr "" + +#: ../java/build/Countries.java:52 +msgid "Cuba" +msgstr "" + +#: ../java/build/Countries.java:53 +msgid "Cape Verde" +msgstr "" + +#: ../java/build/Countries.java:54 +msgid "Cyprus" +msgstr "" + +#: ../java/build/Countries.java:55 +msgid "Czech Republic" +msgstr "" + +#: ../java/build/Countries.java:56 +msgid "Germany" +msgstr "" + +#: ../java/build/Countries.java:57 +msgid "Djibouti" +msgstr "" + +#: ../java/build/Countries.java:58 +msgid "Denmark" +msgstr "" + +#: ../java/build/Countries.java:59 +msgid "Dominica" +msgstr "" + +#: ../java/build/Countries.java:60 +msgid "Dominican Republic" +msgstr "" + +#: ../java/build/Countries.java:61 +msgid "Algeria" +msgstr "" + +#: ../java/build/Countries.java:62 +msgid "Ecuador" +msgstr "" + +#: ../java/build/Countries.java:63 +msgid "Estonia" +msgstr "" + +#: ../java/build/Countries.java:64 +msgid "Egypt" +msgstr "" + +#: ../java/build/Countries.java:65 +msgid "Eritrea" +msgstr "" + +#: ../java/build/Countries.java:66 +msgid "Spain" +msgstr "" + +#: ../java/build/Countries.java:67 +msgid "Ethiopia" +msgstr "" + +#: ../java/build/Countries.java:68 +msgid "Finland" +msgstr "" + +#: ../java/build/Countries.java:69 +msgid "Fiji" +msgstr "" + +#: ../java/build/Countries.java:70 +msgid "Falkland Islands (Malvinas)" +msgstr "" + +#: ../java/build/Countries.java:71 +msgid "Federated States of Micronesia" +msgstr "" + +#: ../java/build/Countries.java:72 +msgid "Faroe Islands" +msgstr "" + +#: ../java/build/Countries.java:73 +msgid "France" +msgstr "Франция" + +#: ../java/build/Countries.java:74 +msgid "Gabon" +msgstr "" + +#: ../java/build/Countries.java:75 +msgid "United Kingdom" +msgstr "" + +#: ../java/build/Countries.java:76 +msgid "Grenada" +msgstr "" + +#: ../java/build/Countries.java:77 +msgid "Georgia" +msgstr "" + +#: ../java/build/Countries.java:78 +msgid "French Guiana" +msgstr "" + +#: ../java/build/Countries.java:79 +msgid "Ghana" +msgstr "" + +#: ../java/build/Countries.java:80 +msgid "Gibraltar" +msgstr "" + +#: ../java/build/Countries.java:81 +msgid "Greenland" +msgstr "" + +#: ../java/build/Countries.java:82 +msgid "Gambia" +msgstr "" + +#: ../java/build/Countries.java:83 +msgid "Guinea" +msgstr "" + +#: ../java/build/Countries.java:84 +msgid "Guadeloupe" +msgstr "" + +#: ../java/build/Countries.java:85 +msgid "Equatorial Guinea" +msgstr "" + +#: ../java/build/Countries.java:86 +msgid "Greece" +msgstr "" + +#: ../java/build/Countries.java:87 +msgid "South Georgia and the South Sandwich Islands" +msgstr "" + +#: ../java/build/Countries.java:88 +msgid "Guatemala" +msgstr "" + +#: ../java/build/Countries.java:89 +msgid "Guam" +msgstr "" + +#: ../java/build/Countries.java:90 +msgid "Guinea-Bissau" +msgstr "" + +#: ../java/build/Countries.java:91 +msgid "Guyana" +msgstr "" + +#: ../java/build/Countries.java:92 +msgid "Hong Kong" +msgstr "Гонконг" + +#: ../java/build/Countries.java:93 +msgid "Honduras" +msgstr "" + +#: ../java/build/Countries.java:94 +msgid "Croatia" +msgstr "" + +#: ../java/build/Countries.java:95 +msgid "Haiti" +msgstr "" + +#: ../java/build/Countries.java:96 +msgid "Hungary" +msgstr "" + +#: ../java/build/Countries.java:97 +msgid "Indonesia" +msgstr "" + +#: ../java/build/Countries.java:98 +msgid "Ireland" +msgstr "" + +#: ../java/build/Countries.java:99 +msgid "Israel" +msgstr "" + +#: ../java/build/Countries.java:101 +msgid "India" +msgstr "" + +#: ../java/build/Countries.java:102 +msgid "British Indian Ocean Territory" +msgstr "" + +#: ../java/build/Countries.java:103 +msgid "Iraq" +msgstr "" + +#: ../java/build/Countries.java:104 +msgid "Islamic Republic of Iran" +msgstr "" + +#: ../java/build/Countries.java:105 +msgid "Iceland" +msgstr "" + +#: ../java/build/Countries.java:106 +msgid "Italy" +msgstr "" + +#: ../java/build/Countries.java:108 +msgid "Jamaica" +msgstr "" + +#: ../java/build/Countries.java:109 +msgid "Jordan" +msgstr "" + +#: ../java/build/Countries.java:110 +msgid "Japan" +msgstr "" + +#: ../java/build/Countries.java:111 +msgid "Kenya" +msgstr "" + +#: ../java/build/Countries.java:112 +msgid "Kyrgyzstan" +msgstr "" + +#: ../java/build/Countries.java:113 +msgid "Cambodia" +msgstr "" + +#: ../java/build/Countries.java:114 +msgid "Kiribati" +msgstr "" + +#: ../java/build/Countries.java:115 +msgid "Comoros" +msgstr "" + +#: ../java/build/Countries.java:116 +msgid "Saint Kitts and Nevis" +msgstr "" + +#: ../java/build/Countries.java:117 +msgid "Republic of Korea" +msgstr "" + +#: ../java/build/Countries.java:118 +msgid "Kuwait" +msgstr "" + +#: ../java/build/Countries.java:119 +msgid "Cayman Islands" +msgstr "" + +#: ../java/build/Countries.java:120 +msgid "Kazakhstan" +msgstr "" + +#: ../java/build/Countries.java:121 +msgid "Lao People's Democratic Republic" +msgstr "" + +#: ../java/build/Countries.java:122 +msgid "Lebanon" +msgstr "" + +#: ../java/build/Countries.java:123 +msgid "Saint Lucia" +msgstr "" + +#: ../java/build/Countries.java:124 +msgid "Liechtenstein" +msgstr "" + +#: ../java/build/Countries.java:125 +msgid "Sri Lanka" +msgstr "" + +#: ../java/build/Countries.java:126 +msgid "Liberia" +msgstr "" + +#: ../java/build/Countries.java:127 +msgid "Lesotho" +msgstr "" + +#: ../java/build/Countries.java:128 +msgid "Lithuania" +msgstr "" + +#: ../java/build/Countries.java:129 +msgid "Luxembourg" +msgstr "" + +#: ../java/build/Countries.java:130 +msgid "Latvia" +msgstr "" + +#: ../java/build/Countries.java:131 +msgid "Libyan Arab Jamahiriya" +msgstr "" + +#: ../java/build/Countries.java:132 +msgid "Morocco" +msgstr "" + +#: ../java/build/Countries.java:133 +msgid "Monaco" +msgstr "" + +#: ../java/build/Countries.java:134 +msgid "Republic of Moldova" +msgstr "" + +#: ../java/build/Countries.java:137 +msgid "Madagascar" +msgstr "" + +#: ../java/build/Countries.java:138 +msgid "Marshall Islands" +msgstr "" + +#: ../java/build/Countries.java:139 +msgid "The Former Yugoslav Republic of Macedonia" +msgstr "" + +#: ../java/build/Countries.java:140 +msgid "Mali" +msgstr "" + +#: ../java/build/Countries.java:141 +msgid "Myanmar" +msgstr "" + +#: ../java/build/Countries.java:142 +msgid "Mongolia" +msgstr "" + +#: ../java/build/Countries.java:143 +msgid "Macao" +msgstr "" + +#: ../java/build/Countries.java:144 +msgid "Northern Mariana Islands" +msgstr "" + +#: ../java/build/Countries.java:145 +msgid "Martinique" +msgstr "" + +#: ../java/build/Countries.java:146 +msgid "Mauritania" +msgstr "" + +#: ../java/build/Countries.java:147 +msgid "Montserrat" +msgstr "" + +#: ../java/build/Countries.java:148 +msgid "Malta" +msgstr "" + +#: ../java/build/Countries.java:149 +msgid "Mauritius" +msgstr "" + +#: ../java/build/Countries.java:150 +msgid "Maldives" +msgstr "" + +#: ../java/build/Countries.java:151 +msgid "Malawi" +msgstr "" + +#: ../java/build/Countries.java:152 +msgid "Mexico" +msgstr "" + +#: ../java/build/Countries.java:153 +msgid "Malaysia" +msgstr "" + +#: ../java/build/Countries.java:154 +msgid "Mozambique" +msgstr "" + +#: ../java/build/Countries.java:155 +msgid "Namibia" +msgstr "" + +#: ../java/build/Countries.java:156 +msgid "New Caledonia" +msgstr "" + +#: ../java/build/Countries.java:157 +msgid "Niger" +msgstr "" + +#: ../java/build/Countries.java:158 +msgid "Norfolk Island" +msgstr "" + +#: ../java/build/Countries.java:159 +msgid "Nigeria" +msgstr "" + +#: ../java/build/Countries.java:160 +msgid "Nicaragua" +msgstr "" + +#: ../java/build/Countries.java:161 +msgid "Netherlands" +msgstr "" + +#: ../java/build/Countries.java:162 +msgid "Norway" +msgstr "" + +#: ../java/build/Countries.java:163 +msgid "Nepal" +msgstr "" + +#: ../java/build/Countries.java:164 +msgid "Nauru" +msgstr "" + +#: ../java/build/Countries.java:165 +msgid "Niue" +msgstr "" + +#: ../java/build/Countries.java:166 +msgid "New Zealand" +msgstr "" + +#: ../java/build/Countries.java:167 +msgid "Oman" +msgstr "" + +#: ../java/build/Countries.java:168 +msgid "Panama" +msgstr "" + +#: ../java/build/Countries.java:169 +msgid "Peru" +msgstr "" + +#: ../java/build/Countries.java:170 +msgid "French Polynesia" +msgstr "" + +#: ../java/build/Countries.java:171 +msgid "Papua New Guinea" +msgstr "" + +#: ../java/build/Countries.java:172 +msgid "Philippines" +msgstr "" + +#: ../java/build/Countries.java:173 +msgid "Pakistan" +msgstr "" + +#: ../java/build/Countries.java:174 +msgid "Poland" +msgstr "" + +#: ../java/build/Countries.java:175 +msgid "Saint Pierre and Miquelon" +msgstr "" + +#: ../java/build/Countries.java:176 +msgid "Puerto Rico" +msgstr "" + +#: ../java/build/Countries.java:177 +msgid "Palestinian Territory" +msgstr "" + +#: ../java/build/Countries.java:178 +msgid "Portugal" +msgstr "" + +#: ../java/build/Countries.java:179 +msgid "Palau" +msgstr "" + +#: ../java/build/Countries.java:180 +msgid "Paraguay" +msgstr "" + +#: ../java/build/Countries.java:181 +msgid "Qatar" +msgstr "" + +#: ../java/build/Countries.java:182 +msgid "Reunion" +msgstr "" + +#: ../java/build/Countries.java:183 +msgid "Romania" +msgstr "" + +#: ../java/build/Countries.java:184 +msgid "Serbia" +msgstr "" + +#: ../java/build/Countries.java:185 +msgid "Russian Federation" +msgstr "" + +#: ../java/build/Countries.java:186 +msgid "Rwanda" +msgstr "" + +#: ../java/build/Countries.java:187 +msgid "Saudi Arabia" +msgstr "" + +#: ../java/build/Countries.java:188 +msgid "Solomon Islands" +msgstr "" + +#: ../java/build/Countries.java:189 +msgid "Seychelles" +msgstr "" + +#: ../java/build/Countries.java:190 +msgid "Sudan" +msgstr "" + +#: ../java/build/Countries.java:191 +msgid "Sweden" +msgstr "" + +#: ../java/build/Countries.java:192 +msgid "Singapore" +msgstr "" + +#: ../java/build/Countries.java:193 +msgid "Slovenia" +msgstr "" + +#: ../java/build/Countries.java:194 +msgid "Slovakia" +msgstr "" + +#: ../java/build/Countries.java:195 +msgid "Sierra Leone" +msgstr "" + +#: ../java/build/Countries.java:196 +msgid "San Marino" +msgstr "" + +#: ../java/build/Countries.java:197 +msgid "Senegal" +msgstr "" + +#: ../java/build/Countries.java:198 +msgid "Somalia" +msgstr "" + +#: ../java/build/Countries.java:199 +msgid "Suriname" +msgstr "" + +#: ../java/build/Countries.java:200 +msgid "Sao Tome and Principe" +msgstr "" + +#: ../java/build/Countries.java:201 +msgid "El Salvador" +msgstr "" + +#: ../java/build/Countries.java:202 +msgid "Syrian Arab Republic" +msgstr "" + +#: ../java/build/Countries.java:203 +msgid "Swaziland" +msgstr "" + +#: ../java/build/Countries.java:204 +msgid "Turks and Caicos Islands" +msgstr "" + +#: ../java/build/Countries.java:205 +msgid "Chad" +msgstr "" + +#: ../java/build/Countries.java:206 +msgid "French Southern Territories" +msgstr "" + +#: ../java/build/Countries.java:207 +msgid "Togo" +msgstr "" + +#: ../java/build/Countries.java:208 +msgid "Thailand" +msgstr "" + +#: ../java/build/Countries.java:209 +msgid "Tajikistan" +msgstr "" + +#: ../java/build/Countries.java:210 +msgid "Tokelau" +msgstr "" + +#: ../java/build/Countries.java:211 +msgid "Timor-Leste" +msgstr "" + +#: ../java/build/Countries.java:212 +msgid "Turkmenistan" +msgstr "" + +#: ../java/build/Countries.java:213 +msgid "Tunisia" +msgstr "" + +#: ../java/build/Countries.java:214 +msgid "Tonga" +msgstr "" + +#: ../java/build/Countries.java:215 +msgid "Turkey" +msgstr "" + +#: ../java/build/Countries.java:216 +msgid "Trinidad and Tobago" +msgstr "" + +#: ../java/build/Countries.java:217 +msgid "Tuvalu" +msgstr "" + +#: ../java/build/Countries.java:218 +msgid "Taiwan" +msgstr "" + +#: ../java/build/Countries.java:219 +msgid "United Republic of Tanzania" +msgstr "" + +#: ../java/build/Countries.java:220 +msgid "Ukraine" +msgstr "" + +#: ../java/build/Countries.java:221 +msgid "Uganda" +msgstr "" + +#: ../java/build/Countries.java:222 +msgid "United States Minor Outlying Islands" +msgstr "" + +#: ../java/build/Countries.java:223 +msgid "United States" +msgstr "" + +#: ../java/build/Countries.java:224 +msgid "Uruguay" +msgstr "" + +#: ../java/build/Countries.java:225 +msgid "Uzbekistan" +msgstr "" + +#: ../java/build/Countries.java:226 +msgid "Holy See (Vatican City State)" +msgstr "" + +#: ../java/build/Countries.java:227 +msgid "Saint Vincent and the Grenadines" +msgstr "" + +#: ../java/build/Countries.java:228 +msgid "Venezuela" +msgstr "" + +#: ../java/build/Countries.java:229 +#: ../java/build/Countries.java:230 +msgid "Virgin Islands" +msgstr "" + +#: ../java/build/Countries.java:231 +msgid "Viet Nam" +msgstr "" + +#: ../java/build/Countries.java:232 +msgid "Vanuatu" +msgstr "" + +#: ../java/build/Countries.java:233 +msgid "Wallis and Futuna" +msgstr "" + +#: ../java/build/Countries.java:234 +msgid "Samoa" +msgstr "" + +#: ../java/build/Countries.java:235 +msgid "Yemen" +msgstr "" + +#: ../java/build/Countries.java:236 +msgid "Mayotte" +msgstr "" + +#: ../java/build/Countries.java:237 +msgid "South Africa" +msgstr "" + +#: ../java/build/Countries.java:238 +msgid "Zambia" +msgstr "" + +#: ../java/build/Countries.java:239 +msgid "Zimbabwe" +msgstr "" + +#: ../java/src/net/i2p/router/web/CSSHelper.java:41 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:26 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:28 +#: ../java/strings/Strings.java:29 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/index_jsp.java:234 +msgid "I2P Router Console" +msgstr "Консоль Маршрутизатора I2P" + +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:57 +msgid "Error updating the configuration - please see the error logs" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:69 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:251 +msgid "Configuration saved successfully" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:253 +msgid "Error saving the configuration (applied but not saved) - please see the error logs" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:32 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:321 +msgid "Save Client Configuration" +msgstr "Сохраните Настройки Клиента" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:36 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:333 +msgid "Save WebApp Configuration" +msgstr "Сохранять WebApp Конфигурацию" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:54 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:67 +msgid "Start" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:68 +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:49 +msgid "Unsupported" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:83 +msgid "Client configuration saved successfully - restart required to take effect." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:89 +msgid "Bad client index." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:94 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:17 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:359 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:371 +msgid "Client" +msgstr "Клиент" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:94 +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:129 +msgid "started" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:111 +msgid "WebApp configuration saved successfully - restart required to take effect." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:129 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:34 +msgid "WebApp" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:131 +msgid "Failed to start" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:137 +msgid "Failed to find server." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:17 +msgid "Class and arguments" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:17 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:34 +msgid "Run at Startup?" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:17 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:34 +msgid "Start Now" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:34 +msgid "Description" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:18 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:320 +msgid "Add key" +msgstr "Добавить ключ" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:19 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:322 +msgid "Delete key" +msgstr "Удалить ключ" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:21 +msgid "You must enter a destination" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:23 +msgid "You must enter a key" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:34 +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:41 +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:43 +msgid "Key for" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:34 +msgid "added to keyring" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:36 +msgid "Invalid destination or key" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:41 +msgid "removed from keyring" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:43 +msgid "not found in keyring" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:45 +msgid "Invalid destination" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52 +msgid "CRIT" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52 +msgid "DEBUG" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52 +msgid "ERROR" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52 +msgid "INFO" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52 +msgid "WARN" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18 +msgid "Network" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18 +msgid "Service" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:82 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:253 +msgid "Tunnels" +msgstr "Туннели" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18 +msgid "UI" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:205 +msgid "Update" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 +msgid "Clients" +msgstr "Клиенты" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:292 +msgid "Keyring" +msgstr "хранения данных" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 +msgid "Logging" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:88 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 +msgid "Peers" +msgstr "Пиры" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:293 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:124 +msgid "Stats" +msgstr "Статистика" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20 +msgid "Advanced" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:47 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:35 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:357 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:494 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:333 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:373 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:341 +msgid "Save changes" +msgstr "Сохранить изменения" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:119 +msgid "Rechecking router reachability..." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:148 +msgid "Updating IP address" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:166 +msgid "Disabling TCP completely" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:170 +msgid "Updating inbound TCP address to" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:174 +msgid "Disabling inbound TCP" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:176 +msgid "Updating inbound TCP address to auto" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:185 +msgid "Updating inbound TCP port to" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:188 +msgid "Updating inbound TCP port to auto" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:200 +msgid "Updating UDP port from" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:200 +msgid "to" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:216 +msgid "Gracefully restarting into Hidden Router Mode" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:218 +msgid "Gracefully restarting to exit Hidden Router Mode" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:227 +msgid "Enabling UPnP, restart required to take effect" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:229 +msgid "Disabling UPnP, restart required to take effect" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:235 +msgid "Requiring SSU introduers" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:275 +msgid "Gracefully restarting I2P to change published router address" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:293 +msgid "Updating bandwidth share percentage" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:363 +msgid "Updated bandwidth limits" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:39 +#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:47 +#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:50 +#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:57 +#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:60 +msgid "unknown" +msgstr "неизвестный" + +#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:165 +msgid "bits per second" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:20 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:314 +msgid "Ban peer until restart" +msgstr "Запрет пир пока маршрутизатора перезагружается" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:23 +#, java-format +msgid "Manually banned via {0}" +msgstr "Вручную запретили через {0}" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:24 +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:33 +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:35 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:187 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:235 +msgid "Peer" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:24 +msgid "banned until restart" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:27 +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:38 +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:59 +msgid "Invalid peer" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:28 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:316 +msgid "Unban peer" +msgstr "Отмена запрета пира" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:33 +msgid "unbanned" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:35 +msgid "is not currently banned" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:39 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:322 +msgid "Adjust Profile Bonuses" +msgstr "Настройка дополнительных потоков профиля" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:47 +msgid "Bad speed value" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:52 +msgid "Bad capacity value" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:32 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:57 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:292 +msgid "Shutdown immediately" +msgstr "Выключить сразу" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:36 +msgid "Cancel shutdown" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:37 +msgid "Cancel restart" +msgstr "Отмена перезагрузка" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:39 +msgid "Restart immediately" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:43 +msgid "Restart" +msgstr "Перезагрузка" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:46 +msgid "Shutdown" +msgstr "Выключение" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:57 +msgid "Shutdown imminent" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:60 +#, java-format +msgid "Shutdown in {0}" +msgstr "Выключение через {0}" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:65 +#, java-format +msgid "Restart in {0}" +msgstr "Перезагрузка через {0}" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:53 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:290 +msgid "Shutdown gracefully" +msgstr "Грациозно выключить" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:56 +msgid "Graceful shutdown initiated" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:60 +msgid "Shutdown immediately! boom bye bye bad bwoy" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:61 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:294 +msgid "Cancel graceful shutdown" +msgstr "Отмена изящные выключении" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:63 +msgid "Graceful shutdown cancelled" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:64 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:308 +msgid "Graceful restart" +msgstr "Мягкого перезапуска" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:67 +msgid "Graceful restart requested" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:68 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:310 +msgid "Hard restart" +msgstr "Жесткая перезагрузка" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:71 +msgid "Hard restart requested" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:72 +msgid "Rekey and Restart" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:73 +msgid "Rekeying after graceful restart" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:76 +msgid "Rekey and Shutdown" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:77 +msgid "Rekeying after graceful shutdown" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:80 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:338 +msgid "Run I2P on startup" +msgstr "Запуск I2P при запуске" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:82 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:340 +msgid "Don't run I2P on startup" +msgstr "Не запускать при запуске I2P" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:84 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:356 +msgid "Dump threads" +msgstr "ССамосвал память" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:91 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:324 +msgid "Show systray icon" +msgstr "Показать системном трее значок" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:96 +msgid "System tray icon enabled." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:98 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:110 +msgid "System tray icon feature not supported on this platform. Sorry!" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:101 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:113 +msgid "Warning: unable to contact the systray manager" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:103 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:326 +msgid "Hide systray icon" +msgstr "Скрыть системном трее значок" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:108 +msgid "System tray icon disabled." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:115 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:364 +msgid "View console on startup" +msgstr "Открыть консоль при старте" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:117 +msgid "Console is to be shown on startup" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:118 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:366 +msgid "Do not view console on startup" +msgstr "Не рассматривают консоль при старте" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:120 +msgid "Console is not to be shown on startup" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:129 +msgid "Service installed" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:131 +msgid "Warning: unable to install the service" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:137 +msgid "Service removed" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:139 +msgid "Warning: unable to remove the service" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:118 +msgid "Stat filter and location updated successfully to" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:120 +msgid "Failed to update the stat filter and location" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:121 +msgid "Graph list updated, may take up to 60s to be reflected here and on the Graphs Page" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:137 +msgid "Updated settings for all pools." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:142 +msgid "Exploratory tunnel configuration saved successfully." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:144 +#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:36 +msgid "Error saving the configuration (applied but not saved) - please see the error logs." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:11 +msgid "hop" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:12 +msgid "tunnel" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:14 +msgid "hops" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:15 +msgid "tunnels" +msgstr "туннели" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:26 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:40 +msgid "Exploratory tunnels" +msgstr "Разведочные туннели" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:46 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:60 +msgid "Client tunnels for" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:69 +msgid "ANONYMITY WARNING - Settings include 0-hop tunnels." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:74 +msgid "ANONYMITY WARNING - Settings include 1-hop tunnels." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:77 +msgid "PERFORMANCE WARNING - Settings include very long tunnels." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:80 +msgid "PERFORMANCE WARNING - Settings include high tunnel quantities." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:82 +msgid "Inbound" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:82 +msgid "Outbound" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:87 +msgid "Depth" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:104 +msgid "Randomization" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:128 +msgid "Quantity" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:145 +msgid "Backup quantity" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:167 +msgid "Inbound options" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:180 +msgid "Outbound options" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:31 +msgid "Theme change saved." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:33 +msgid "Refresh the page to view." +msgstr "Обновите страницу, чтобы просмотреть." + +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:41 +msgid "English" +msgstr "Английский" + +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:41 +msgid "French" +msgstr "Французский" + +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:41 +msgid "German" +msgstr "Немецкий" + +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:42 +msgid "Chinese" +msgstr "Китайский" + +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:42 +msgid "Dutch" +msgstr "Голландский" + +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:42 +msgid "Swedish" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:56 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:310 +msgid "Check for updates" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:63 +msgid "Update available, attempting to download now" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:65 +msgid "Update available, click button on left to download" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:67 +msgid "No update available" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:75 +msgid "Updating news URL to" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:83 +msgid "Updating proxy host to" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:91 +msgid "Updating proxy port to" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:104 +msgid "Updating refresh frequency to" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:111 +msgid "Updating update policy to" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:120 +msgid "Updating update URLs." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:128 +msgid "Updating trusted keys." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:136 +msgid "Updating unsigned update URL to" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:75 +#: ../java/src/net/i2p/router/web/GraphHelper.java:115 +msgid "Never" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:77 +msgid "Every" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:90 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:92 +msgid "Notify only" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:95 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:97 +msgid "Download and verify only" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:101 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:103 +msgid "Download, verify, and restart" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:107 +msgid "Configure Graph Display" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:107 +msgid "Select Stats" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:109 +msgid "Periods" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:110 +msgid "Plot averages" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:111 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:405 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:336 +msgid "or" +msgstr "или" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:111 +msgid "plot events" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:112 +msgid "Image sizes" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:112 +msgid "width" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:113 +msgid "height" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:113 +#: ../java/src/net/i2p/router/web/GraphHelper.java:114 +msgid "pixels" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:115 +msgid "Refresh delay" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:115 +msgid "hour" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:115 +msgid "minute" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:115 +msgid "minutes" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:116 +msgid "Redraw" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:59 +msgid "Network Database RouterInfo Lookup" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:74 +msgid "Router" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:74 +msgid "not found in network database" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:82 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:134 +msgid "Network Database Contents" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:83 +msgid "View RouterInfo" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:84 +msgid "LeaseSets" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92 +msgid "LeaseSet" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:94 +msgid "Local" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +msgid "Unpublished" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:97 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:104 +msgid "Destination" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:114 +#, java-format +msgid "Expires in {0}" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:116 +#, java-format +msgid "Expired {0} ago" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:118 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:156 +msgid "Gateway" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:118 +msgid "Lease" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:120 +msgid "Tunnel" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:134 +msgid "View LeaseSets" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:136 +msgid "Not initialized" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:145 +msgid "Routers" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:147 +msgid "Show all routers" +msgstr "Показать все маршрутизаторы" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:149 +msgid "Show all routers with full stats" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184 +msgid "Network Database Router Statistics" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:204 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:222 +msgid "Count" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +msgid "Version" +msgstr "Версия" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:204 +msgid "Transports" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:222 +msgid "Country" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:254 +msgid "Our info" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:256 +msgid "Peer info for" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:260 +msgid "Full entry" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:96 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:581 +msgid "Hidden" +msgstr "Скрыто" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:266 +msgid "Updated" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:267 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:270 +#, java-format +msgid "{0} ago" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:269 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:273 +msgid "Published" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:275 +msgid "Address(es)" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:308 +msgid "Hidden or starting up" +msgstr "Скрытая или запуском" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:308 +msgid "SSU" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:308 +msgid "SSU with introducers" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:309 +msgid "NTCP" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:309 +msgid "NTCP and SSU" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:309 +msgid "NTCP and SSU with introducers" +msgstr "" + +#: ../java/src/net/i2p/router/web/NewsFetcher.java:80 +#, java-format +msgid "News last updated {0} ago." +msgstr "" + +#: ../java/src/net/i2p/router/web/NewsFetcher.java:86 +#, java-format +msgid "News last checked {0} ago." +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:72 +msgid "Peer Profiles" +msgstr "Профили Пиров" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:73 +#, java-format +msgid "Showing {0} recent profiles." +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:75 +#, java-format +msgid "Hiding {0} older profiles." +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:77 +#, java-format +msgid "Hiding {0} standard profiles." +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:82 +msgid "Groups (Caps)" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:83 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:251 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:334 +msgid "Speed" +msgstr "Скорость" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:84 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:253 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:338 +msgid "Capacity" +msgstr "Способность" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:85 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:255 +msgid "Integration" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:86 +msgid "Status" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:126 +msgid "Fast, High Capacity" +msgstr "Быстрый, Высокая Производительная Мощность" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:127 +msgid "High Capacity" +msgstr "Высокая производительная мощность" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:128 +msgid "Standard" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:129 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:163 +msgid "Failing" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:249 +msgid "Integrated" +msgstr "Интегрированные" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:162 +msgid "Banned" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:164 +msgid "Unreachable" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:171 +msgid "Test Fails" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:175 +msgid "profile" +msgstr "профиль" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:184 +msgid "Floodfill and Integrated Peers" +msgstr "Floodfill и Интегрированные Пиры" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:188 +msgid "Caps" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:189 +msgid "Integ. Value" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:190 +msgid "Last Heard About" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:191 +msgid "Last Heard From" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:192 +msgid "Last Good Send" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:193 +msgid "Last Bad Send" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:194 +msgid "10m Resp. Time" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:195 +msgid "1h Resp. Time" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:196 +msgid "1d Resp. Time" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:197 +msgid "Last Good Lookup" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:198 +msgid "Last Bad Lookup" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:199 +msgid "Last Good Store" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200 +msgid "Last Bad Store" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:201 +msgid "1h Fail Rate" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202 +msgid "1d Fail Rate" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:250 +msgid "Thresholds" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:252 +msgid "fast peers" +msgstr "быстрые пиры" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:254 +msgid "high capacity peers" +msgstr "пиры у которых высокая производительная мощность" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:256 +msgid " well integrated peers" +msgstr "хорошо интегрированные пиры" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:257 +msgid "Definitions" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:258 +msgid "as determined by the profile organizer" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:258 +msgid "groups" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 +msgid "capabilities in the netDb, not used to determine profiles" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 +msgid "caps" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 +msgid "peak throughput (bytes per second) over a 1 minute period that the peer has sustained in a single tunnel" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 +msgid "speed" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 +msgid "capacity" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 +msgid "how many tunnels can we ask them to join in an hour?" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 +msgid "how many new peers have they told us about lately?" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 +msgid "integration" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 +msgid "is the peer banned, or unreachable, or failing tunnel tests?" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 +msgid "status" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:321 +msgid "n/a" +msgstr "" + +#: ../java/src/net/i2p/router/web/ShitlistRenderer.java:57 +#, java-format +msgid "Temporary ban expiring in {0}" +msgstr "" + +#: ../java/src/net/i2p/router/web/ShitlistRenderer.java:59 +#, java-format +msgid "Banned until restart or in {0}" +msgstr "Запрещены до перезагрузку через {0}" + +#: ../java/src/net/i2p/router/web/ShitlistRenderer.java:71 +msgid "unban now" +msgstr "" + +#: ../java/src/net/i2p/router/web/StatsGenerator.java:58 +msgid "Statistics gathered during this router's uptime" +msgstr "" + +#: ../java/src/net/i2p/router/web/StatsGenerator.java:61 +msgid "The data gathered is quantized over a 1 minute period, so should just be used as an estimate." +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:40 +msgid "Configure startup of clients and webapps (services); manually start dormant services" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:42 +msgid "I2P Services" +msgstr "Сервисы I2P" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:48 +msgid "Manage your I2P hosts file here (I2P domain name resolution)" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:50 +msgid "Addressbook" +msgstr "Адресная Книжка" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:54 +msgid "Built-in anonymous BitTorrent Client" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:56 +msgid "Torrents" +msgstr "Торренты" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:60 +msgid "Anonymous webmail client" +msgstr "Аноним электронной почтовый веб-клиент" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:62 +msgid "Webmail" +msgstr "Веб-Почта" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:66 +msgid "Anonymous resident webserver" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:68 +msgid "Webserver" +msgstr "Веб-Сервер" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:72 +msgid "Configure I2P Router" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:74 +msgid "I2P Internals" +msgstr "Внутренняя Организация I2P" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:80 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:344 +msgid "View existing tunnels and tunnel build status" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:86 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 +msgid "Show all current peer connections" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:92 +msgid "Show recent peer performance profiles" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:94 +msgid "Profiles" +msgstr "Профили" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:98 +msgid "Show list of all known I2P routers" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:100 +msgid "NetDB" +msgstr "СетьДБ" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:104 +msgid "Health Report" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:106 +msgid "Logs" +msgstr "Логи" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:110 +msgid "Show the router's workload, and how it's performing" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:112 +msgid "Jobs" +msgstr "Задачи" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:116 +msgid "Graph router performance" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:118 +msgid "Graphs" +msgstr "Диаграммы" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +msgid "Textual router performance statistics" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:134 +msgid "I2P Router Help" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:136 +msgid "General" +msgstr "Общий" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 +msgid "Your unique I2P router identity is" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:143 +msgid "never reveal it to anyone" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 +msgid "Local Identity" +msgstr "Локальный Адрес" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 +msgid "How long we've been running for this session" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160 +msgid "Uptime" +msgstr "Аптайм" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:167 +msgid "Help with configuring your firewall and router for optimal I2P performance" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194 +msgid "Download" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 +msgid "Download Unsigned" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 +msgid "Active" +msgstr "Активные" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:237 +msgid "Fast" +msgstr "Быстрые" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:243 +msgid "High capacity" +msgstr "Высокая производительная мощность" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:255 +msgid "Known" +msgstr "Общепризнанные" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 +msgid "Help with firewall configuration" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:272 +msgid "Check NAT/firewall" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292 +msgid "Reseed" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +msgid "Configure router bandwidth allocation" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 +msgid "Bandwidth in/out" +msgstr "Пропускная способность входящего/выходящего" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 +msgid "Total" +msgstr "Всего" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:336 +msgid "Used" +msgstr "Использовано" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +msgid "Tunnels in/out" +msgstr "Туннели входящие/выходящие " + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 +msgid "Exploratory" +msgstr "Разведочные" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 +msgid "Participating" +msgstr "Участвующие" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +msgid "What's in the router's job queue?" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:375 +msgid "Congestion" +msgstr "Перегрузка" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:380 +msgid "Job lag" +msgstr "Задержка задачи" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:386 +msgid "Message delay" +msgstr "Задержка доставки сообщения" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:392 +msgid "Tunnel lag" +msgstr "Задержка туннеля" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:398 +msgid "Backlog" +msgstr "Очередь" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:73 +msgid "skew" +msgstr "отклонение" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:92 +msgid "ERR-Client Manager I2CP Error - check logs" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:94 +msgid "ERR-ClockSkew" +msgstr "ОШИБКА-ЧасиОтклонение" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:103 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:557 +msgid "OK" +msgstr "ОК" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:104 +msgid "ERR-Private TCP Address" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:106 +msgid "ERR-SymmetricNAT" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:109 +msgid "WARN-Firewalled with Inbound TCP Enabled" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:111 +msgid "WARN-Firewalled and Floodfill" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:113 +msgid "WARN-Firewalled and Fast" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:114 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:561 +msgid "Firewalled" +msgstr "За Брандмауэром" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:116 +msgid "ERR-UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and restart" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:123 +msgid "ERR-UDP Disabled and Inbound TCP host/port not set" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:125 +msgid "WARN-Firewalled with UDP Disabled" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:127 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:577 +msgid "Testing" +msgstr "Проверка" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:360 +msgid "Add/remove/edit & control your client and server tunnels" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:360 +msgid "Local Destinations" +msgstr "Локальные Пункты Назначения" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:369 +msgid "Server" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:373 +msgid "Show tunnels" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:384 +msgid "Leases expired" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:384 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:385 +msgid "Rebuilding" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:385 +msgid "ago" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:388 +msgid "Ready" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:392 +msgid "Building" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:392 +msgid "Building tunnels" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:404 +#: ../java/strings/Strings.java:36 +msgid "shared clients" +msgstr "клиенты c расшаренной базой" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:40 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:62 +msgid "configure" +msgstr "конфигурировать" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:64 +msgid "dead" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70 +msgid "Participating tunnels" +msgstr "Участвующие туннели" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71 +msgid "From" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71 +msgid "Receive on" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 +msgid "Expiration" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 +msgid "Send on" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 +msgid "To" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73 +msgid "Rate" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73 +msgid "Role" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:156 +msgid "Usage" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:107 +msgid "grace period" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:117 +msgid "Outbound Endpoint" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:119 +msgid "Inbound Gateway" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:121 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 +msgid "Participant" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:126 +msgid "Inactive participating tunnels" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:127 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:216 +msgid "Lifetime bandwidth usage" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:156 +msgid "Expiry" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:156 +msgid "In/Out" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:159 +msgid "Participants" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:165 +msgid "Endpoint" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:205 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211 +msgid "Build in progress" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:205 +msgid "inbound" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211 +msgid "outbound" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:215 +msgid "No tunnels; waiting for the grace period to end." +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:216 +msgid "in" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:217 +msgid "out" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:234 +msgid "Tunnel Counts By Peer" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:235 +msgid "% of total" +msgstr "% всего" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:235 +msgid "Expl. + Client" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:235 +msgid "Part. from + to" +msgstr "" + +#: ../java/strings/Strings.java:12 +msgid "addressbook" +msgstr "адресная книжка" + +#: ../java/strings/Strings.java:13 +msgid "i2psnark" +msgstr "" + +#: ../java/strings/Strings.java:14 +msgid "i2ptunnel" +msgstr "" + +#: ../java/strings/Strings.java:15 +msgid "susimail" +msgstr "" + +#: ../java/strings/Strings.java:16 +msgid "susidns" +msgstr "" + +#: ../java/strings/Strings.java:17 +msgid "routerconsole" +msgstr "" + +#: ../java/strings/Strings.java:22 +msgid "Web console" +msgstr "" + +#: ../java/strings/Strings.java:23 +msgid "SAM application bridge" +msgstr "" + +#: ../java/strings/Strings.java:24 +msgid "Application tunnels" +msgstr "" + +#: ../java/strings/Strings.java:25 +msgid "My eepsite web server" +msgstr "" + +#: ../java/strings/Strings.java:26 +msgid "I2P webserver (eepsite)" +msgstr "" + +#: ../java/strings/Strings.java:27 +msgid "Browser launch at startup" +msgstr "" + +#: ../java/strings/Strings.java:28 +msgid "BOB application bridge" +msgstr "" + +#: ../java/strings/Strings.java:30 +msgid "Open Router Console in web browser at startup" +msgstr "" + +#: ../java/strings/Strings.java:37 +msgid "IRC proxy" +msgstr "" + +#: ../java/strings/Strings.java:38 +msgid "eepsite" +msgstr "" + +#: ../java/strings/Strings.java:39 +msgid "I2P webserver" +msgstr "" + +#: ../java/strings/Strings.java:40 +msgid "HTTP Proxy" +msgstr "" + +#: ../java/strings/Strings.java:42 +msgid "eepProxy" +msgstr "" + +#: ../java/strings/Strings.java:43 +msgid "ircProxy" +msgstr "" + +#: ../java/strings/Strings.java:45 +msgid "I2PSnark" +msgstr "" + +#: ../java/strings/Strings.java:47 +msgid "iMule" +msgstr "" + +#: ../java/strings/Strings.java:51 +msgid "classic" +msgstr "" + +#: ../java/strings/Strings.java:52 +msgid "dark" +msgstr "" + +#: ../java/strings/Strings.java:53 +msgid "light" +msgstr "" + +#: ../java/strings/Strings.java:54 +msgid "midnight" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:106 +msgid "config networking" +msgstr "конфигурация сети" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:217 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:218 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:217 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:217 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:231 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:217 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:217 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:218 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:217 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:217 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:217 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:228 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:217 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/index_jsp.java:223 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:216 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:216 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:216 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:216 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:216 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:216 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:236 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:216 +msgid "Refresh (s)" +msgstr "Обновить (сек)" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:221 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:222 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:221 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:221 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:235 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:221 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:221 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:222 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:221 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:221 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:221 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:224 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:232 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:221 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:224 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/index_jsp.java:227 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:224 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:239 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:220 +msgid "Enable" +msgstr "Включать" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:241 +msgid "I2P Network Configuration" +msgstr "I2P Настройке Сети" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:297 +msgid "Bandwidth limiter" +msgstr "Ограничитель диапазона частот" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:299 +msgid "I2P will work best if you configure your rates to match the speed of your internet connection." +msgstr "I2P будет работать лучше, если Вы настроите частоту для подбора соответствующей скорости подсоединения к Интернету." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:303 +msgid "KBps In" +msgstr "Кбит/сек Загруженное" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:317 +msgid "KBps Out" +msgstr "Кбит/сек Закаченное" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:333 +msgid "Share" +msgstr "Поделено" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:340 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:307 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:303 +msgid "NOTE" +msgstr "ЗАМЕТЬТЕ" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:342 +#, java-format +msgid "You have configured I2P to share only {0} KBps." +msgstr "Вы настроили протокол I2P, чтоб использовать только {0} килобит информации за секунду." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:345 +msgid "I2P requires at least 12KBps to enable sharing. " +msgstr "I2P требует, по крайней мере 12KBps чтобы поделить трафик. " + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:346 +msgid "Please enable sharing (participating in tunnels) by configuring more bandwidth. " +msgstr "Пожалуйста, включите поделен трафик (участие в туннелях), настроя больше пропускной способностью. " + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:347 +msgid "It improves your anonymity by creating cover traffic, and helps the network." +msgstr "Это улучшает вашу анонимность создавая покрытия трафика, а также помогает в сети." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:350 +#, java-format +msgid "You have configured I2P to share {0} KBps." +msgstr "Вы настроили протокол I2P, чтоб использовать {0} килобит информации за секунду." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:353 +msgid "The higher the share bandwidth the more you improve your anonymity and help the network." +msgstr "Чем больше пропускная способность входящего/исходящего канала расшаренного ресурса, тем больше Вы поддерживаете анонимность и тем самым помогаете сети." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:359 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:496 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:305 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:324 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:335 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:375 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:343 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:323 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:356 +msgid "Cancel" +msgstr "Отклонить изменения" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:363 +msgid "IP and Transport Configuration" +msgstr "IP и конфигурации транспорта" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:365 +msgid "The default settings will work for most people." +msgstr "Настройки по умолчанию будет работать для большинства людей." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:367 +msgid "There is help below." +msgstr "Дополнительную информацию смотрите ниже:" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:369 +msgid "UPnP Configuration" +msgstr "Конфигурация UPnP" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:373 +msgid "Enable UPnP to open firewall ports" +msgstr "Запустите UPnP, чтоб открыть порты брандмауэра" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:375 +msgid "UPnP status" +msgstr "статус UPnP" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:377 +msgid "IP Configuration" +msgstr "IP Конфигурация" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:379 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:441 +msgid "Externally reachable hostname or IP address" +msgstr "Внешне достижимое имя хоста или IP -адрес" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:383 +msgid "Use all auto-detect methods" +msgstr "Используйте все методы автоматического опознавания" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:387 +msgid "Disable UPnP IP address detection" +msgstr "Отключите детектор IP-адреса UPnP" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:391 +msgid "Ignore local interface IP address" +msgstr "Отклоните IP адрес локального интерфейса." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:395 +msgid "Use SSU IP address detection only" +msgstr "Используйте только детектор IP- адреса SSU" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:399 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:459 +msgid "Specify hostname or IP" +msgstr "Установите имя хоста или IP" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:405 +msgid "Select Interface" +msgstr "Выбирать Интерфейс" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:419 +msgid "Hidden mode - do not publish IP" +msgstr "Скрытый метод – не разглашайте IP адрес" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:421 +msgid "(prevents participating traffic)" +msgstr "(препятствует причастному трафику)" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:423 +msgid "UDP Configuration:" +msgstr "UDP Конфигурация" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:425 +msgid "UDP port:" +msgstr "UDP Порт:" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:439 +msgid "TCP Configuration" +msgstr "TCP Конфигурация" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:445 +msgid "Use auto-detected IP address" +msgstr "Используйте только автоматически распознанный IP -адрес" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:447 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 +msgid "currently" +msgstr "в настоящее время" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:451 +msgid "if we are not firewalled" +msgstr "если есть доступ к порту." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:455 +msgid "Always use auto-detected IP address (Not firewalled)" +msgstr "Всегда используйте только автоматически распознанный IP-адрес (а не адрес брандмауэра)" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:465 +msgid "Disable inbound (Firewalled)" +msgstr "Отключите входящие (за брандмауэром)" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:469 +msgid "Completely disable" +msgstr "Полностью отключите" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:471 +msgid "(select only if behind a firewall that throttles or blocks outbound TCP)" +msgstr "(выберете, только если брандмауэр тормозит работу или блокирует выходные данные протокола управления передачей данных)" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:473 +msgid "Externally reachable TCP port" +msgstr "Внешне достижимый порт протокола TCP" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:477 +msgid "Use the same port configured for UDP" +msgstr "Используйте тот же порт, настроенный для протокола UDP" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:485 +msgid "Specify Port" +msgstr "Определите Порт" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:489 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:342 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:329 +msgid "Note" +msgstr "Заметьте" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:492 +msgid "Changing these settings will restart your router." +msgstr "При изменении настроек, происходит перезагрузка маршрутизатора." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:498 +msgid "Configuration Help" +msgstr "Помощь конфигурации" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:500 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:549 +msgid "While I2P will work fine behind most firewalls, your speeds and network integration will generally improve if the I2P port is forwarded for both UDP and TCP." +msgstr "Хотя I2P будет прекрасно работать позади большинства брандмауэров, ваша скорость и сетевой интеграции, вероятно, улучшится, если порт I2P направляется для UDP и TCP." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:502 +msgid "If you can, please poke a hole in your firewall to allow unsolicited UDP and TCP packets to reach you." +msgstr "Если можно, сделайте, пожалуйста, отверстие в брандмауэре, чтоб самостоятельно предоставленные UDP и TCP-пакеты могли дойти до Вас." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:504 +msgid "If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole punching with \"SSU introductions\" to relay traffic." +msgstr "Если не можете, I2P поспособствует тому, чтоб UPnP (набор сетевых протоколов) и отверстие в UDP, проделанное «применением SSU» переключили трафик." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:506 +msgid "Most of the options above are for special situations, for example where UPnP does not work correctly, or a firewall not under your control is doing harm." +msgstr "Множество из перечисленных опций предназначены для использования в отдельных ситуациях, к примеру, где UPnP работает неверно, или брандмауэр находится вне контроля и причиняет вред." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:508 +msgid "Certain firewalls such as symmetric NATs may not work well with I2P." +msgstr "Некоторые брадмауэры, к примеру, симметричные NAT-устройствам (преобразования сетевых адресов) могут и «не сработаться» с I2P." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:517 +msgid "UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect the external IP address and forward ports." +msgstr "UPnP используется для связи с интернет-шлюзом (IGDs), чтоб определять внешний IP-адрес и передовые порты." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:519 +msgid "UPnP support is beta, and may not work for any number of reasons" +msgstr "Поддержка UPnP не испробована, и может не работать по нескольким причинам" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:521 +msgid "No UPnP-compatible device present" +msgstr "Отсутствие UPnP- существующее совместимое устройство" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:523 +msgid "UPnP disabled on the device" +msgstr "Выключенный UPnP в устройстве" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:525 +msgid "Software firewall interference with UPnP" +msgstr "Взаимодействие программного обеспечения брандмауэра с UPnP" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:527 +msgid "Bugs in the device's UPnP implementation" +msgstr "Ошибки при внедрении устройства UPnP" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:529 +msgid "Multiple firewall/routers in the internet connection path" +msgstr "Разнообразные брандмауэры/маршрутизаторы в способах подсоединения к интернету" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:531 +msgid "UPnP device change, reset, or address change" +msgstr "Замена устройства UPnP, перезагрузка или изменение адреса" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:533 +msgid "Review the UPnP status here." +msgstr "Обзор статуса UPnP здесь." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:535 +msgid "UPnP may be enabled or disabled above, but a change requires a router restart to take effect." +msgstr "UPnP может быть включено или отключено, но для получения желательного результата изменения требуется перезагрузка маршрутизатора." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:537 +msgid "Hostnames entered above will be published in the network database." +msgstr "Имена хоста, зарегистрированные выше, будут опубликованы в базе данных сети." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:539 +msgid "They are not private." +msgstr "Они не являются личными." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:541 +msgid "Also, do not enter a private IP address like 127.0.0.1 or 192.168.1.1." +msgstr "Также, не запишите личный IP-адрес, как 127.0.0.1 или 192.168.1.1." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:543 +msgid "If you specify the wrong IP address or hostname, or do not properly configure your NAT or firewall, your network performance will degrade substantially." +msgstr "Если Вы установите неправильный IP-адрес или имя хоста, или неправильно сконфигурируете Ваше NAT-устройство или брандмауэр, работа сети будет существенно ухудшаться." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:545 +msgid "When in doubt, leave the settings at the defaults." +msgstr "Если Вы сомневаетесь, не заходите на настройки." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:547 +msgid "Reachability Help" +msgstr "Помощь доступности" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:552 +msgid "If you think you have opened up your firewall and I2P still thinks you are firewalled, remember that you may have multiple firewalls, for example both software packages and external hardware routers." +msgstr "Если Вы думаете, что открыли Ваш брандмауэр, а протокол I2P все еще думает, что доступа к порту нет, помните, что у Вас могут быть различные брандмауэры, то есть,- и программное обеспечение, и внешние маршрутизаторы аппаратного обеспечения." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:555 +msgid "If there is an error, the logs may also help diagnose the problem." +msgstr "Если обнаружится ошибка, текстовые файлы (logs) могут помочь раскрыть сущность проблемы." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:559 +msgid "Your UDP port does not appear to be firewalled." +msgstr "Ваш UDP порт не закрыт" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:563 +msgid "Your UDP port appears to be firewalled." +msgstr "Ваш UDP-порт закрыт. Кажеться что ваш UDP порт за брандмауером." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:565 +msgid "As the firewall detection methods are not 100% reliable, this may occasionally be displayed in error." +msgstr "Поскольку методы детектирования брандмауэра не надежны на 100 %, может случайно обнаружиться ошибка." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:567 +msgid "However, if it appears consistently, you should check whether both your external and internal firewalls are open for your port." +msgstr "Однако, если окажется, последовательно, Вы должны убедиться, как внешний и внутренний брандмауэр открыт для вашего порта." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:569 +msgid "I2P will work fine when firewalled, there is no reason for concern. When firewalled, the router uses \"introducers\" to relay inbound connections." +msgstr "Сеть заработает должным образом, если будет закрыт порт, причин для беспокойства нет. Когда доступа к порту нет, маршрутизатор использует «устройство ввода», чтоб ретранслировать входящее соединение." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:571 +msgid "However, you will get more participating traffic and help the network more if you can open your firewall(s)." +msgstr "Несмотря на это, Вы получите больше сетевого трафика и тем самым поможете работе сети при условии, если откроете брандмауэры." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:573 +msgid "If you think you have already done so, remember that you may have both a hardware and a software firewall, or be behind an additional, institutional firewall you cannot control." +msgstr "Если думаете, что Вы все сделали правильно, помните, что у Вас может быть как аппаратное, так и программное оборудование, и что в обходе дополнительного, основного брандмауэра, Вы не можете контролировать." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:575 +msgid "Also, some routers cannot correctly forward both TCP and UDP on a single port, or may have other limitations or bugs that prevent them from passing traffic through to I2P." +msgstr "Также некоторые маршрутизаторы не могут правильно отсылать TCP и UDP протоколы на один порт, или же они могут иметь иные ограничения или вирусы, которые препятствуют прохождению трафика в I2P." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:579 +msgid "The router is currently testing whether your UDP port is firewalled." +msgstr "Маршрутизатор проверяет, закрыт ли Ваш UDP порт." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:583 +msgid "The router is not configured to publish its address, therefore it does not expect incoming connections." +msgstr "Маршрутизатор не конфигурируется для публикации адреса, поэтому он не ожидает входящего соединения." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:585 +msgid "WARN - Firewalled and Fast" +msgstr "ПРЕДУПРЕЖДЕНИЕ - За Брандмауэром и Быстрый" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:587 +msgid "You have configured I2P to share more than 128KBps of bandwidth, but you are firewalled." +msgstr "Вы сконфигурировали протокол I2P, чтоб использовать более, чем 128 килобайт в секунду диапазона частоты, но доступа к порту нет." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:589 +msgid "While I2P will work fine in this configuration, if you really have over 128KBps of bandwidth to share, it will be much more helpful to the network if you open your firewall." +msgstr "Хотя сеть будет должным образом работать в этой конфигурации, если Вы действительно имеете для совместного использования более 128 килобайт в секунду диапазона частот, будет лучше для сети, если б Вы открыли брандмауэр." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:591 +msgid "WARN - Firewalled and Floodfill" +msgstr "ПРЕДУПРЕЖДЕНИЕ - За Брандмауэром и Floodfill" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:593 +msgid "You have configured I2P to be a floodfill router, but you are firewalled." +msgstr "Вы настроили I2P быть floodfill маршрутизатора, но маршрутизатор за брандмауэром." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:595 +msgid "For best participation as a floodfill router, you should open your firewall." +msgstr "Для лучшей совместной работы в качестве floodfill маршрутизатора, Вы должны открыть свой брандмауэр." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:597 +msgid "WARN - Firewalled with Inbound TCP Enabled" +msgstr "ПРЕДУПРЕЖДЕНИЕ - За Брандмауэром и Входящий TCP Включено" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:599 +msgid "You have configured inbound TCP, however your UDP port is firewalled, and therefore it is likely that your TCP port is firewalled as well." +msgstr "Вы сконфигурировали входящий TCP, однако Ваш UDP порт закрыт, поэтому скорее всего Ваш TCP – порт так же закрыт." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:601 +msgid "If your TCP port is firewalled with inbound TCP enabled, routers will not be able to contact you via TCP, which will hurt the network." +msgstr "Если Ваш TCP порт закрыт входящим включенным TCP, маршрутизаторы не смогут соединиться с Вами через TCP, т.к. могут повредить сеть." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:603 +msgid "Please open your firewall or disable inbound TCP above." +msgstr "Пожалуйста, откройте свой брандмауэр или отключенный входящий порт TCP." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:605 +msgid "WARN - Firewalled with UDP Disabled" +msgstr "ПРЕДУПРЕЖДЕНИЕ - За Брандмауэром и UDP Отключенный" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:607 +msgid "You have configured inbound TCP, however you have disabled UDP." +msgstr "Вы сконфигурировали входящий TCP, но все равно Вы отключили UDP." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:609 +msgid "You appear to be firewalled on TCP, therefore your router cannot accept inbound connections." +msgstr "Вы firewalled on TCP, поэтому Ваш маршрутизатор не может принять входящие соединения." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:611 +msgid "Please open your firewall or enable UDP." +msgstr "Пожалуйста, откройте свой брандмауер или закройте UDP." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:613 +msgid "ERR - Clock Skew" +msgstr "ОШИБКА - Часы Отклонение" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:615 +msgid "Your system's clock is skewed, which will make it difficult to participate in the network." +msgstr "Вашы часы системного времени сбились, что усложнит работу в сети." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:617 +msgid "Correct your clock setting if this error persists." +msgstr "Настройте часы, если эта ошибка не исчезает." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:619 +msgid "ERR - Private TCP Address" +msgstr "ОШИБКА - Частный TCP Адрес" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:621 +msgid "You must never advertise an unroutable IP address such as 127.0.0.1 or 192.168.1.1 as your external address." +msgstr "Нельзя разглашать немаршрутизируемый IP –адрес, как 127.0.0.1 или 192.168.1.1 в качестве Вашего внешнего адреса." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:623 +msgid "Correct the address or disable inbound TCP above." +msgstr "Исправьте адрес или отключите входящий TCP сверх." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:625 +msgid "ERR - SymmetricNAT" +msgstr "ОШИБКА - симметрическим NAT" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:627 +msgid "I2P detected that you are firewalled by a Symmetric NAT." +msgstr "I2P определила, что порт был закрыт симметрическим NAT." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:629 +msgid "I2P does not work well behind this type of firewall. You will probably not be able to accept inbound connections, which will limit your participation in the network." +msgstr "I2P не работает должным образом из-за отсутствия доступа к порту. Возможно, Вы не сможете принять входящее соединение, которое будет ограничивать доступ к сети." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:631 +msgid "ERR - UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and restart" +msgstr "ОШИБКА - UDP-порта уже используется - Настройте i2np.udp.internalPort=xxxx в advanced config и перезагрузите" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:633 +msgid "I2P was unable to bind to port 8887 or other configured port." +msgstr "I2P не мог подсоединиться к порту 8887 или к другому конфигурируемому порту." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:635 +msgid "Check to see if another program is using the configured port. If so, stop that program or configure I2P to use a different port." +msgstr "Проверьте что другая программа использует настроенный порт. Если да, то остановить программу или настроить I2P использовать другой порт." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:637 +msgid "This may be a transient error, if the other program is no longer using the port." +msgstr "Может произойти сбой, если другая программа больше не использует этот порт." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:639 +msgid "However, a restart is always required after this error." +msgstr "Однако после такой ошибки всегда требуется перезагрузка." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:641 +msgid "ERR - UDP Disabled and Inbound TCP host/port not set" +msgstr "ОШИБКА - UDP отключен и входящий TCP / порт не указан" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:643 +msgid "You have not configured inbound TCP with a hostname and port above, however you have disabled UDP." +msgstr "Вы не сконфигурировали входящий TCP с именем хоста и выше указанным портом, но все равно Вы отключили UDP." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:645 +msgid "Therefore your router cannot accept inbound connections." +msgstr "Следовательно Ваш маршрутизатор не может принять входящее соединение." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:647 +msgid "Please configure a TCP host and port above or enable UDP." +msgstr "Пожалуйста, сконфигурируйте хост TCP и выше указанный порт или же включите UDP." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:649 +msgid "ERR - Client Manager I2CP Error - check logs" +msgstr "ОШИБКА - Менеджер Клиентов I2CP Ошибка - проверьте текстовые файлы (logs)" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:651 +msgid "This is usually due to a port 7654 conflict. Check the logs to verify." +msgstr "Обычно это обусловлено конфликтом порта 7654 (ошибка). Проверьте текстовые файлы (logs), чтоб удостовериться." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:653 +msgid "Do you have another I2P instance running? Stop the conflicting program and restart I2P." +msgstr "У Вас есть другое выполнение запроса через протокол I2P? Остановите эту программу и перезагрузите I2P." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:107 +msgid "config advanced" +msgstr "расширенные настройки" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:242 +msgid "I2P Advanced Configuration" +msgstr "I2P Расширенные Настройки" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:299 +msgid "Advanced I2P Configuration" +msgstr "Расширенные I2P Настройки" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:303 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:321 +msgid "Apply" +msgstr "Применить" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:309 +msgid "Some changes may require a restart to take effect." +msgstr "Может потребоваться перезагрузка системы для того, чтобы некоторые изменения вступили в силу." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:106 +msgid "config clients" +msgstr "настройка клиента" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:241 +msgid "I2P Client Configuration" +msgstr "I2P Настройка Клиента" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:306 +msgid "Client Configuration" +msgstr "Настройка Клиента" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:308 +msgid "The Java clients listed below are started by the router and run in the same JVM." +msgstr "Java-клиенты, приведенные ниже, запускаются маршрутизатором и действуют в одной и той же Java-машине." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:312 +msgid "To change other client options, edit the file" +msgstr "Для того, чтобы изменить другие пользовательские настройки, выполните редактирование файла" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:319 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:331 +msgid "All changes require restart to take effect." +msgstr "Для того, чтобы данные изменения вступили в силу, выполните перезагрузку I2P." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:323 +msgid "WebApp Configuration" +msgstr "WebApp Конфигурация" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:325 +msgid "The Java web applications listed below are started by the webConsole client and run in the same JVM as the router. They are usually web applications accessible through the router console. They may be complete applications (e.g. i2psnark),front-ends to another client or application which must be separately enabled (e.g. susidns, i2ptunnel), or have no web interface at all (e.g. addressbook)." +msgstr "Веб-приложения Java, перечисленные ниже, запускаются при помощи консольного клиента с веб-интерфейсом и действуют в той же Java-машине, что и маршрутизатор. Обычно это веб-приложения, доступные через консоль маршрутизатора. Они могут быть полными (например, i2psnark), обеспечивающими взаимодействие с внешними клиентами или приложениями, которые должны быть запущены отдельно (например, susidns, i2ptunnel), или же такими, которые не имеют интерфейса вообще (например, addressbook)." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:327 +msgid "A web app may also be disabled by removing the .war file from the webapps directory; however the .war file and web app will reappear when you update your router to a newer version, so disabling the web app here is the preferred method." +msgstr "Веб-приложение также можно блокировать посредством удаления файла с расширением .war из папки webappsс веб-приложениями; тем не менее, файл с расширением .war и веб-приложение появятся, когда вы обновите маршрутизатор до более новой версии, так что блокировка веб-приложения является предпочтительной." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:106 +msgid "config keyring" +msgstr "конфигурация для устройств хранения данных" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:228 +msgid "I2P Keyring Configuration" +msgstr "Конфигурация I2P Для Устройств Хранения Данных" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:294 +msgid "The router keyring is used to decrypt encrypted leaseSets." +msgstr "Устройство хранения данных маршрутизатора используется для расшифровки зашифрованных наборов адресов." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:297 +msgid "The keyring may contain keys for local or remote encrypted destinations." +msgstr "На устройстве могут содержаться ключи для локальных или удаленных адресов зашифрованных назначений." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:307 +msgid "Manual Keyring Addition" +msgstr "Ручное Дополнение К Накопителю Информации" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:309 +msgid "Enter keys for encrypted remote destinations here." +msgstr "Введите ключи для зашифрованных удаленных адресов." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:312 +msgid "Keys for local destinations must be entered on the" +msgstr "Ключи для локальных адресов назначения необходимо ввести на" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:314 +msgid "I2PTunnel page" +msgstr "странице I2PTunnel" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:316 +msgid "Dest. name, hash, or full key" +msgstr "Имя адреса назначения, хэш или полный ключ" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:318 +msgid "Encryption Key" +msgstr "Криптографический ключ" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:107 +msgid "config logging" +msgstr "настройка журнала" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:242 +msgid "I2P Logging Configuration" +msgstr "I2P Настройке Журнала" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:299 +msgid "Configure I2P Logging Options" +msgstr "Опции Записи Конфигурации I2P" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:301 +msgid "Logging filename" +msgstr "Имя файла записи" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:305 +msgid "(the symbol '@' will be replaced during log rotation)" +msgstr "(символ «@» будет заменен в процессе сканирования записи)" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:307 +msgid "Log record format" +msgstr "Формат записи системного журнала" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:311 +msgid "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)" +msgstr "(используйте следующие обозначения: «d» = дата, «c» = класс, «t» = тред, «p» = приоритет, «m» = сообщение)" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:313 +msgid "Log date format" +msgstr "Формат даты записи" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:317 +msgid "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' = millisecond)" +msgstr "(«MM» = месяц, «dd» = день, «HH» = часы, «mm» = минуты, «ss» = секунды, «SSS» = миллисекунды)" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:319 +msgid "Max log file size" +msgstr "Максимальный размер файла системного журнала" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:323 +msgid "Default log level" +msgstr "Уровень записи по умолчанию" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:327 +msgid "(DEBUG and INFO are not recommended defaults, as they will drastically slow down your router)" +msgstr "(настройки DEBUG и INFO не являются рекомендованными по умолчанию, так как они значительно замедляют работу маршрутизатора)" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:329 +msgid "Log level overrides" +msgstr "Редактирование уровня записи" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:106 +msgid "config peers" +msgstr "конфигурация пиров" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:228 +msgid "I2P Peer Configuration" +msgstr "Конфигурация Пиров I2P" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:304 +msgid "Manual Peer Controls" +msgstr "Ручное Управление Пирами" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:306 +msgid "Router Hash" +msgstr "Хэш Маршрутизатора" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:310 +msgid "Manually Ban / Unban a Peer" +msgstr "ручную запретить / разрешить пиры" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:312 +msgid "Banning will prevent the participation of this peer in tunnels you create." +msgstr "Запрет предотвратит участие данного пира в созданных вами туннелях." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:324 +msgid "Bonuses may be positive or negative, and affect the peer's inclusion in Fast and High Capacity tiers. Fast peers are used for client tunnels, and High Capacity peers are used for some exploratory tunnels. Current bonuses are displayed on the" +msgstr "Дополнительные потоки могут быть как положительными и отрицательными, оказывающими влияние на вовлечение узлов сети в быстрых узлах и узлах большой мощност. Быстрые узлы используются для клиентских туннелей, а узлы большой мощности используются в некоторых типах поисковых туннелей. Текущие потоки отображены на" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:326 +msgid "profiles page" +msgstr "странице профилей" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:342 +msgid "Adjust peer bonuses" +msgstr "Настройка дополнительных потоков пиров" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:344 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:253 +msgid "Banned Peers" +msgstr "Запрещенные Пиры" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:366 +msgid "Banned IPs" +msgstr "Запрещенные IP адресы" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:106 +msgid "config service" +msgstr "конфигурация сервиса" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:228 +msgid "I2P Service Configuration" +msgstr "Конфигурация Сервиса I2P" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:284 +msgid "Shutdown the router" +msgstr "Выключить маршрутизатор" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:286 +msgid "Graceful shutdown lets the router satisfy the agreements it has already made before shutting down, but may take a few minutes." +msgstr "Постепенное выключение позволяет маршрутизатору выполнить запланированные задания до его выключения, но это займет несколько минут." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:288 +msgid "If you need to kill the router immediately, that option is available as well." +msgstr "Постепенное выключение позволяет маршрутизатору выполнить запланированные задания до его выключения, но это займет несколько минут." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:298 +msgid "If you want the router to restart itself after shutting down, you can choose one of the following." +msgstr "Если Вы хотите, чтоб маршрутизатор перезагрузился после выключения, Вы можете выбрать одно из действий." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:300 +msgid "This is useful in some situations" +msgstr "В некоторых случаях это полезно" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:302 +msgid "for example, if you changed some settings that client applications only read at startup, such as the routerconsole password or the interface it listens on." +msgstr "к примеру, если Вы поменяли некоторые настройки, которые приложения-клиенты читают только при запуске, такие как пароль консоля маршрутизатора или прослушивание интерфейса." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:304 +msgid "A graceful restart will take a few minutes (but your peers will appreciate your patience), while a hard restart does so immediately." +msgstr "Постепенное выключение будет длиться несколько минут (но твои пиры будут благодарны за твое терпение), а жесткая перезагрузка делает это незамедлительно." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:306 +msgid "After tearing down the router, it will wait 1 minute before starting back up again." +msgstr "После разбора настройки маршрутизатора, пройдет еще 1 минута до загрузки." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:316 +msgid "Systray integration" +msgstr "Система лоток интеграции" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:318 +msgid "On the windows platform, there is a small application to sit in the system tray, allowing you to view the router's status" +msgstr "На платформе Windows, есть небольшое приложение, чтобы сидеть в системном трее, что позволяет Вам просматривать статус маршрутизатора" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:320 +msgid "(later on, I2P client applications will be able to integrate their own functionality into the system tray as well)." +msgstr "(позднее, I2P приложений клиент сможет интегрировать свои функции в системном трее тоже)" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:322 +msgid "If you are on windows, you can either enable or disable that icon here." +msgstr "Если вы на Windows, вы можете включить или отключить этот значок здесь." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:328 +msgid "Run on startup" +msgstr "Запуск при старте" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:330 +msgid "You can control whether I2P is run on startup or not by selecting one of the following options" +msgstr "Вы можете управлять ли I2P запускается при запуске или не выбрать один из следующих вариантов" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:332 +msgid "I2P will install (or remove) a service accordingly." +msgstr "I2P будет установить (или удалить) услуга, соответственно." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:334 +msgid "If you prefer the command line, you can also run the " +msgstr "Если вы предпочитаете командную строку, вы можете также запустить " + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:344 +msgid "If you are running I2P as service right now, removing it will shut down your router immediately." +msgstr "Если вы используете I2P как сервис на данный момент, удалив будет закрыта маршрутизатор немедленно." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:346 +msgid "You may want to consider shutting down gracefully, as above, then running uninstall_i2p_service_winnt.bat." +msgstr "Вы можете рассмотреть вопрос о закрытии грациозно, как указано выше, затем запустить uninstall_i2p_service_winnt.bat." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:354 +msgid "Debugging" +msgstr "Отладка программы" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:360 +msgid "Launch browser on router startup?" +msgstr "Загружать браузер при запуске маршрутизатора?" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:362 +msgid "I2P's main configuration interface is this web console, so for your convenience I2P can launch a web browser on startup pointing at" +msgstr "Основной интерфейс конфигурации I2P таки веб-консоли, поэтому для вашего удобства I2P может открыть веб-браузер при запуске указывая на" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:107 +msgid "config stats" +msgstr "конфигурации статистики" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:229 +msgid "I2P Stats Configuration" +msgstr "Конфигурация Статистики I2P" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:300 +msgid "Configure I2P Stat Collection" +msgstr "Конфигурация Сбора Статистики I2P" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:302 +msgid "Enable full stats?" +msgstr "Активировать полную статистику?" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:309 +msgid "change requires restart to take effect" +msgstr "для того, чтобы изменения вступили в силу, необходима перезагрузка системы" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:311 +msgid "Stat file" +msgstr "Файл статистики" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:315 +msgid "Filter" +msgstr "Фильтр" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:317 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:326 +msgid "toggle all" +msgstr "переключить все" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:328 +msgid "Log" +msgstr "Запись" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:330 +msgid "Graph" +msgstr "Диаграмма" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:369 +msgid "Advanced filter" +msgstr "Дополнительные фильтры" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:106 +msgid "config tunnels" +msgstr "конфигурация туннеля" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:241 +msgid "I2P Tunnel Configuration" +msgstr "Конфигурация Туннеля I2P" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:305 +msgid "The default settings work for most people." +msgstr "Стандартные настройки действуют в большинстве случаев." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:309 +msgid "There is a fundamental tradeoff between anonymity and performance." +msgstr "Необходимо сделать выбор между анонимностью и производительностью." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:312 +msgid "Tunnels longer than 3 hops (for example 2 hops + 0-2 hops, 3 hops + 0-1 hops, 3 hops + 0-2 hops), or a high quantity + backup quantity, may severely reduce performance or reliability." +msgstr "Туннели, длина которых составляет более 3 хопов (например, 2 хопа + 0-2 хопа, 3 хопа + 0-1 хоп, 3 хопа + 0-2 хопа), или большое количество + резервное количество, могут значительно уменьшить производительность или надежность." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:315 +msgid "High CPU and/or high outbound bandwidth usage may result." +msgstr "Это также может привести к перегрузке ЦП и/или ухудшению пропускной способности входящего канала." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:318 +msgid "Change these settings with care, and adjust them if you have problems." +msgstr "Будьте внимательны при изменении данных настроек, урегулируйте их в том случае, если возникнут какие-либо проблемы." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:332 +msgid "Exploratory tunnel setting changes are stored in the router.config file." +msgstr "Разведочный туннель изменений параметров хранятся в файле router.config." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:335 +msgid "Client tunnel changes are temporary and are not saved." +msgstr "Клиент туннель изменения являются временными и не сохраняются." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:337 +msgid "To make permanent client tunnel changes see the" +msgstr "Для постоянных клиентов изменения туннеля см." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:339 +msgid "i2ptunnel page" +msgstr "i2ptunnel страницу" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:106 +msgid "config UI" +msgstr "конфигурации интерфейса" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:241 +msgid "I2P UI Configuration" +msgstr "I2P Настройка Пользовательского Интерфейса" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:291 +msgid "Router Console Theme" +msgstr "Тема Консоля Маршрутизатора" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:309 +msgid "Theme selection disabled for Internet Explorer, sorry." +msgstr "Выбор тем отключена для Internet Explorer, извините." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:311 +msgid "If you're not using IE, it's likely that your browser is pretending to be IE; please configure your browser (or proxy) to use a different User Agent string if you'd like to access the console themes." +msgstr "Если вы не используете IE, то, скорее всего, ваш браузер притворяется IE, пожалуйста, настроить Ваш браузер (или прокси-сервера), чтобы использовать различные User Agent String, если вы хотите получить доступ к консоли темам." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:315 +msgid "Router Console Language" +msgstr "Язык Маршрутизатора Консоля" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:319 +msgid "Please contribute to the router console translation project! Contact the developers on IRC #i2p to help." +msgstr "Пожалуйста, помогите маршрутизатор консоли проект по переводу! Свяжете с разработчиками на IRC # I2P помочь." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:106 +msgid "config update" +msgstr "обновленная конфигурация" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:228 +msgid "I2P Update Configuration" +msgstr "Обновленная Конфигурация I2P" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:300 +msgid "Check for I2P and news updates" +msgstr "Проверьте данные I2P и обновление новостей" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:302 +msgid "News & I2P Updates" +msgstr "Новости и Обновление I2P" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:306 +msgid "Update In Progress" +msgstr "Выполняется обновление" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:314 +msgid "News URL" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:318 +msgid "Refresh frequency" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:322 +msgid "Update policy" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:326 +msgid "Update through the eepProxy?" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:330 +msgid "eepProxy host" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:334 +msgid "eepProxy port" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:338 +msgid "Update URLs" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:342 +msgid "Trusted keys" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:346 +msgid "Update with unsigned development builds?" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:350 +msgid "Unsigned Build URL" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:354 +msgid "Save" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:117 +msgid "Page Not Found" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:243 +msgid "Sorry! You appear to be requesting a non-existent Router Console page or resource." +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:245 +msgid "Error 404" +msgstr "Ошибка 404" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:250 +msgid "not found" +msgstr "не найдено" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:106 +msgid "graphs" +msgstr "диаграммы" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:228 +msgid "I2P Performance Graphs" +msgstr "I2P Диаграммы Производительности" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/index_jsp.java:105 +msgid "home" +msgstr "дома" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:105 +msgid "job queue" +msgstr "очереди заданий" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:227 +msgid "I2P Router Job Queue" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:105 +msgid "logs" +msgstr "логи" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:227 +msgid "I2P Router Logs" +msgstr "I2P Маршрутизатор Логи" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:229 +msgid "I2P Version & Running Environment" +msgstr "I2P Версии & Действуюшая Окружающей Среды" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:231 +msgid "Please include this information in bug reports" +msgstr "Пожалуйста, включите эту информацию в докладах ошибка" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:105 +msgid "network database summary" +msgstr "база данных резюме" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:227 +msgid "I2P Network Database Summary" +msgstr "I2P База Данных Резюме" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:105 +msgid "peer connections" +msgstr "связи пиров" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:227 +msgid "I2P Network Peers" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:105 +msgid "peer profiles" +msgstr "профили пиров" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:227 +msgid "I2P Network Peer Profiles" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:105 +msgid "statistics" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:242 +msgid "I2P Router Statistics" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:245 +#, java-format +msgid "Disable {0}s Refresh" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:105 +msgid "tunnel summary" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:227 +msgid "I2P Tunnel Summary" +msgstr "" + diff --git a/installer/resources/readme/readme_ru.html b/installer/resources/readme/readme_ru.html new file mode 100644 index 000000000..2ea63e941 --- /dev/null +++ b/installer/resources/readme/readme_ru.html @@ -0,0 +1,86 @@ +
      +
      English + Chinese + Deutsch + Français + Nederlands + Русский + Svenska
      +
      +

      Добро Пожаловать В I2P!

      +

      Если Вы только что зашли в I2P, числа слева должны + увеличиваться в течении нескольких минут; Вы увидите пункт назначения «клиентов с расшаренной базой» + (в противном случае, см. информацию ниже). Как только Вы увидите их, +Вы сможете:

      +
        +
      • просмотреть сайты «eepsites» – на I2P существуют анонимно управляемые веб-сайты + – задайте в браузере HTTP прокси серверы 127.0.0.01, порт 4444, затем + перейдите на «eepsite».
        +
          +
        • inproxy.tino.i2p + и perv.i2p сайты, отслеживанющие активные сайты + «eepsites»
          • +
        • forum.i2p: безопасное + и анонимное подсоединение к форуму forum.i2p2.de
          • +
        • www.i2p2.i2p и + mirror i2p-projekt.i2p: безопасное и + анонимное подсоединение к www.i2p2.de
          • +
        • eepsites.i2p: + анонимный сервер поиска сайтов «eepsites»
          • +
        • ugha.i2p: «eepsite» ugha, + вики, который может редактировать каждый пользователь, а ткаже множество ссылок
          • +
        • fproxy.tino.i2p: + Freenet прокси
          • +
        • echelon.i2p: архив + программного обеспечения и информация для I2P
          • +
        • paste.i2p2.i2p: безопасные и + анонимныелогические операции.
          • +

        + Существует также множество других сайтов «eepsites» - следуйте по указанным ссылкам, + добавьте в закладки свои любимые, и заходите на них почаще! +
        • +
          +
        • просматривать веб-страницы - HTTP «внешние прокси» I2P + подключены к Вашей программе HTTP прокси, порт 4444 – просто + настройте прокси своего браузера на такое использование и переходите на любой URL + – ваш запрос будет переадресован в I2P.
          • +
        • отправьте файлы - на Snark BitTorrent-клиенте существует интегрированный порт.
          • +
        • используйте анонимные учетные записи электронной почты - postman создал + почтовую систему, совместимую с обычными почтовыми клиентами (протоколы POP3 / SMTP), что предоставляет + пользоваться почтовыми услугами внутри I2P, а также, по интернету! Получите + учетную запись на hq.postman.i2p. Мы + объединяем почтовых клиентов Susimail, анонимных клиентов + pop3/smtp с веб-интерфейсом, сконфигурированных для получения услуг электронной почты.
          • +
        • общайтесь анонимно - активизируйте Ваш собственный интернет-чат IRC + и подключитесь к серверу 127.0.0.1, порт 6668. Это говорит о том, + что Вы находитесь на анонимном сервере IRC, но ни Вы, ни Ваш собеседник не знает, + где находятся остальные.
          • +
        • ведите блог анонимно - настройте Syndie
          • +
        • и многое другое
          • +
        +
      +

      Хотите иметь собственный сайт «eepsite»?

      +

      Чтобы Вы могли управлять своим сайтом «eepsite» - просмотрите информацию на сервере + Jetty по адресу: + http://127.0.0.1:7658/. + Просто поместите свои файлы на eepsite/docroot/ directory + (или поместите любой стандарный JSP/Servlet .war files под + eepsite/webapps, или стандартный CGI script под + eepsite/cgi-bin) и они появятся. Как только начнется + работа туннелей, Ваш сайт смогут просматривать + другие пользователи. Детальные инструкции о том, как запустить свой сайт, + Вы можете найти на своей временной страничке сайта.

      +

      Поиск и устранение неполадок

      +

      Будьте терпеливы – в первый раз I2P может загружаться медленно, поскольку + будет искать пиры. Если по истечении 30 минут ограниченный/новый счет будет + иметь менее, чем 10 подсоединенных пиров, для лучшего соединения откройте порт + 8887 на Вашем брандмауере (межсетевом экране). Если Вы не видите ни одного + сайта «eepsite» (даже www.i2p2.i2p), проверьте, + подключен ли прокси браузер к 127.0.0.1, порт 4444. Вы также можете просмотреть + информацию на веб-сайте I2P, посылать + сообщения на форум I2P или зайти в чат + #i2p или #i2p в ретранслируемом Интернет-чате по адресу + irc.freenode.net, irc.postman.i2p + или irc.freshcoffee.i2p (они соединены вместе). +

      +
      From 708b3a662c3fc3eab24edd097d2d026ea2619296 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 5 Dec 2009 17:19:23 +0000 Subject: [PATCH 033/127] * Build: Fix poupdate dependency * Console: Add Russian option --- apps/routerconsole/java/build.xml | 2 +- .../java/src/net/i2p/router/web/ConfigUIHelper.java | 6 +++--- history.txt | 4 ++++ router/java/src/net/i2p/router/RouterVersion.java | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml index e5b602129..d8d85e21d 100644 --- a/apps/routerconsole/java/build.xml +++ b/apps/routerconsole/java/build.xml @@ -89,7 +89,7 @@ - + diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java index fffdcad6a..121106e1c 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java @@ -36,10 +36,10 @@ public class ConfigUIHelper extends HelperBase { return rv; } - private static final String langs[] = {"de", "en", "fr", "nl", "se", "zh"}; - private static final String flags[] = {"de", "us", "fr", "nl", "se", "cn"}; + private static final String langs[] = {"de", "en", "fr", "nl", "ru", "se", "zh"}; + private static final String flags[] = {"de", "us", "fr", "nl", "ru", "se", "cn"}; private static final String xlangs[] = {_x("German"), _x("English"), _x("French"), - _x("Dutch"), _x("Swedish"), _x("Chinese")}; + _x("Dutch"), _x("Russian"), _x("Swedish"), _x("Chinese")}; /** todo sort by translated string */ public String getLangSettings() { diff --git a/history.txt b/history.txt index 01e2e6617..c8e1794e1 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +2009-12-05 zzz + * Build: Fix poupdate dependency + * Console: Add Russian option + 2009-12-05 sponge * BOB: fix a critical bug causing ghosts on probes and remove unused code. diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index f55bf0ab2..1e23e3feb 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,9 +18,9 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 26; + public final static long BUILD = 27; /** for example "-test" */ - public final static String EXTRA = ""; + public final static String EXTRA = "-rc"; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; public static void main(String args[]) { System.out.println("I2P Router version: " + FULL_VERSION); From df2e6396928062d08f55d015b7d5255aa3751c69 Mon Sep 17 00:00:00 2001 From: echelon Date: Sat, 5 Dec 2009 20:41:20 +0000 Subject: [PATCH 034/127] first rough translation into german --- apps/routerconsole/locale/messages_de.po | 4690 ++++++++++++++-------- 1 file changed, 2955 insertions(+), 1735 deletions(-) diff --git a/apps/routerconsole/locale/messages_de.po b/apps/routerconsole/locale/messages_de.po index acc1e2197..4621c68fc 100644 --- a/apps/routerconsole/locale/messages_de.po +++ b/apps/routerconsole/locale/messages_de.po @@ -3,20 +3,2841 @@ # This file is distributed under the same license as the routerconsole package. # To contribute translations, see http://www.i2p2.de/newdevelopers # foo , 2009. -# +# msgid "" msgstr "" "Project-Id-Version: I2P routerconsole\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-01 02:59+0000\n" +"POT-Creation-Date: 2009-12-05 19:16+0000\n" "PO-Revision-Date: 2009-10-19 12:50+0000\n" -"Last-Translator: foo \n" +"Last-Translator: echelon \n" "Language-Team: foo \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: German\n" +#: ../../../router/java/src/net/i2p/router/Blocklist.java:117 +#, java-format +msgid "Banned by router hash: {0}" +msgstr "Gebannt über Routerprüfsumme: {0}" + +#: ../../../router/java/src/net/i2p/router/Blocklist.java:119 +msgid "Banned by router hash" +msgstr "Gebannt über Routerprüfsumme" + +#: ../../../router/java/src/net/i2p/router/Blocklist.java:664 +msgid "IP banned" +msgstr "IP gebannt" + +#: ../../../router/java/src/net/i2p/router/Blocklist.java:734 +#, java-format +msgid "IP banned by blocklist.txt entry {0}" +msgstr "IP gebannt wegen blocklist.txt Eintrag" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:91 +msgid "Rejecting tunnels: Shutting down" +msgstr "Weise Tunnelanfragen zurück: beende Router" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:140 +msgid "Rejecting tunnels: High message delay" +msgstr "Weise Tunnelanfragen zurück: Hohe Nachrichtenlatenz" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:176 +msgid "Rejecting most tunnels: High number of requests" +msgstr "Weise Tunnelanfragen zurück: Hohe Anzahl an Anfragen" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:232 +msgid "Rejecting tunnels: Limit reached" +msgstr "Weise Tunnelanfragen zurück: Limit erreicht" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:300 +msgid "Rejecting tunnels: Bandwidth limit" +msgstr "Weise Tunnelanfragen zurück: Bandbreitenlimit erreicht" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:370 +msgid "Rejecting most tunnels: Bandwidth limit" +msgstr "Weise viele Tunnelanfragen zurück: Bandbreitenlimit erreicht" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:374 +msgid "Accepting most tunnels" +msgstr "Akzeptiere viele Tunnelanfragen" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:376 +msgid "Accepting tunnels" +msgstr "Akzeptiere Tunnelanfragen" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:486 +msgid "Rejecting tunnels" +msgstr "Weise Tunnelanfragen zurück" + +#: ../../../router/java/src/net/i2p/router/transport/GetBidsJob.java:70 +msgid "No transports (hidden or starting up?)" +msgstr "Keine Transporte (Versteckter Modus oder Start?)" + +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:450 +msgid "Unreachable on any transport" +msgstr "Unerreichbar auf allen Transporten" + +#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:373 +#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:578 +#, java-format +msgid "Excessive clock skew: {0}" +msgstr "Grosse Abweichung der Uhrzeit: {0}" + +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:128 +msgid "Dropping tunnel requests: Too slow" +msgstr "Lasse Tunnelanfragen unbeantwortet: zu langsam" + +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:340 +msgid "Dropping tunnel requests: Overloaded" +msgstr "Lasse Tunnelanfragen unbeantwortet: Überlast" + +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:499 +msgid "Rejecting tunnels: Request overload" +msgstr "Weise Tunnelanfragen ab: Überlast angefragt" + +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:524 +msgid "Rejecting tunnels: Connection limit" +msgstr "Weise Tunnelanfragen ab: Verbindungslimit erreicht" + +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:725 +msgid "Dropping tunnel requests: High load" +msgstr "Lasse Tunnelanfragen unbeantwortet: Hohe Last" + +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:734 +msgid "Dropping tunnel requests: Queue time" +msgstr "Lasse Tunnelanfragen unbeantwortet: Zu lange unbeantwortet" + +#: ../java/build/Countries.java:3 +msgid "Andorra" +msgstr "Andorra" + +#: ../java/build/Countries.java:4 +msgid "United Arab Emirates" +msgstr "Vereinigte Arabische Emirate" + +#: ../java/build/Countries.java:5 +msgid "Afghanistan" +msgstr "" + +#: ../java/build/Countries.java:6 +msgid "Antigua and Barbuda" +msgstr "" + +#: ../java/build/Countries.java:7 +msgid "Anguilla" +msgstr "" + +#: ../java/build/Countries.java:8 +msgid "Albania" +msgstr "Albanien" + +#: ../java/build/Countries.java:9 +msgid "Armenia" +msgstr "Armenien" + +#: ../java/build/Countries.java:10 +msgid "Netherlands Antilles" +msgstr "Niederländische Antillen" + +#: ../java/build/Countries.java:11 +msgid "Angola" +msgstr "" + +#: ../java/build/Countries.java:12 +msgid "Antarctica" +msgstr "Antarktis" + +#: ../java/build/Countries.java:13 +msgid "Argentina" +msgstr "" + +#: ../java/build/Countries.java:14 +msgid "American Samoa" +msgstr "" + +#: ../java/build/Countries.java:15 +msgid "Austria" +msgstr "Österreich" + +#: ../java/build/Countries.java:16 +msgid "Australia" +msgstr "Australien" + +#: ../java/build/Countries.java:17 +msgid "Aruba" +msgstr "" + +#: ../java/build/Countries.java:19 +msgid "Azerbaijan" +msgstr "" + +#: ../java/build/Countries.java:20 +msgid "Bosnia and Herzegovina" +msgstr "" + +#: ../java/build/Countries.java:21 +msgid "Barbados" +msgstr "" + +#: ../java/build/Countries.java:22 +msgid "Bangladesh" +msgstr "" + +#: ../java/build/Countries.java:23 +msgid "Belgium" +msgstr "Belgien" + +#: ../java/build/Countries.java:24 +msgid "Burkina Faso" +msgstr "" + +#: ../java/build/Countries.java:25 +msgid "Bulgaria" +msgstr "" + +#: ../java/build/Countries.java:26 +msgid "Bahrain" +msgstr "" + +#: ../java/build/Countries.java:27 +msgid "Burundi" +msgstr "" + +#: ../java/build/Countries.java:28 +msgid "Benin" +msgstr "" + +#: ../java/build/Countries.java:29 +msgid "Bermuda" +msgstr "" + +#: ../java/build/Countries.java:30 +msgid "Brunei Darussalam" +msgstr "" + +#: ../java/build/Countries.java:31 +msgid "Bolivia" +msgstr "" + +#: ../java/build/Countries.java:32 +msgid "Brazil" +msgstr "" + +#: ../java/build/Countries.java:33 +msgid "Bahamas" +msgstr "" + +#: ../java/build/Countries.java:34 +msgid "Bhutan" +msgstr "" + +#: ../java/build/Countries.java:35 +msgid "Bouvet Island" +msgstr "" + +#: ../java/build/Countries.java:36 +msgid "Botswana" +msgstr "" + +#: ../java/build/Countries.java:37 +msgid "Belarus" +msgstr "" + +#: ../java/build/Countries.java:38 +msgid "Belize" +msgstr "" + +#: ../java/build/Countries.java:39 +msgid "Canada" +msgstr "" + +#: ../java/build/Countries.java:40 +msgid "The Democratic Republic of the Congo" +msgstr "" + +#: ../java/build/Countries.java:41 +msgid "Central African Republic" +msgstr "" + +#: ../java/build/Countries.java:42 +msgid "Congo" +msgstr "" + +#: ../java/build/Countries.java:43 +msgid "Switzerland" +msgstr "Schweiz" + +#: ../java/build/Countries.java:44 +msgid "Cote D'Ivoire" +msgstr "" + +#: ../java/build/Countries.java:45 +msgid "Cook Islands" +msgstr "" + +#: ../java/build/Countries.java:46 +msgid "Chile" +msgstr "" + +#: ../java/build/Countries.java:47 +msgid "Cameroon" +msgstr "" + +#: ../java/build/Countries.java:48 +msgid "China" +msgstr "" + +#: ../java/build/Countries.java:49 +msgid "Colombia" +msgstr "" + +#: ../java/build/Countries.java:50 +msgid "Costa Rica" +msgstr "" + +#: ../java/build/Countries.java:51 +msgid "Serbia and Montenegro" +msgstr "" + +#: ../java/build/Countries.java:52 +msgid "Cuba" +msgstr "" + +#: ../java/build/Countries.java:53 +msgid "Cape Verde" +msgstr "" + +#: ../java/build/Countries.java:54 +msgid "Cyprus" +msgstr "" + +#: ../java/build/Countries.java:55 +msgid "Czech Republic" +msgstr "" + +#: ../java/build/Countries.java:56 +msgid "Germany" +msgstr "" + +#: ../java/build/Countries.java:57 +msgid "Djibouti" +msgstr "" + +#: ../java/build/Countries.java:58 +msgid "Denmark" +msgstr "Dänemark" + +#: ../java/build/Countries.java:59 +msgid "Dominica" +msgstr "" + +#: ../java/build/Countries.java:60 +msgid "Dominican Republic" +msgstr "" + +#: ../java/build/Countries.java:61 +msgid "Algeria" +msgstr "" + +#: ../java/build/Countries.java:62 +msgid "Ecuador" +msgstr "" + +#: ../java/build/Countries.java:63 +msgid "Estonia" +msgstr "" + +#: ../java/build/Countries.java:64 +msgid "Egypt" +msgstr "" + +#: ../java/build/Countries.java:65 +msgid "Eritrea" +msgstr "" + +#: ../java/build/Countries.java:66 +msgid "Spain" +msgstr "" + +#: ../java/build/Countries.java:67 +msgid "Ethiopia" +msgstr "" + +#: ../java/build/Countries.java:68 +msgid "Finland" +msgstr "Finnland" + +#: ../java/build/Countries.java:69 +msgid "Fiji" +msgstr "" + +#: ../java/build/Countries.java:70 +msgid "Falkland Islands (Malvinas)" +msgstr "" + +#: ../java/build/Countries.java:71 +msgid "Federated States of Micronesia" +msgstr "" + +#: ../java/build/Countries.java:72 +msgid "Faroe Islands" +msgstr "" + +#: ../java/build/Countries.java:73 +msgid "France" +msgstr "" + +#: ../java/build/Countries.java:74 +msgid "Gabon" +msgstr "" + +#: ../java/build/Countries.java:75 +msgid "United Kingdom" +msgstr "England" + +#: ../java/build/Countries.java:76 +msgid "Grenada" +msgstr "" + +#: ../java/build/Countries.java:77 +msgid "Georgia" +msgstr "" + +#: ../java/build/Countries.java:78 +msgid "French Guiana" +msgstr "" + +#: ../java/build/Countries.java:79 +msgid "Ghana" +msgstr "" + +#: ../java/build/Countries.java:80 +msgid "Gibraltar" +msgstr "" + +#: ../java/build/Countries.java:81 +msgid "Greenland" +msgstr "" + +#: ../java/build/Countries.java:82 +msgid "Gambia" +msgstr "" + +#: ../java/build/Countries.java:83 +msgid "Guinea" +msgstr "" + +#: ../java/build/Countries.java:84 +msgid "Guadeloupe" +msgstr "" + +#: ../java/build/Countries.java:85 +msgid "Equatorial Guinea" +msgstr "" + +#: ../java/build/Countries.java:86 +msgid "Greece" +msgstr "" + +#: ../java/build/Countries.java:87 +msgid "South Georgia and the South Sandwich Islands" +msgstr "" + +#: ../java/build/Countries.java:88 +msgid "Guatemala" +msgstr "" + +#: ../java/build/Countries.java:89 +msgid "Guam" +msgstr "" + +#: ../java/build/Countries.java:90 +msgid "Guinea-Bissau" +msgstr "" + +#: ../java/build/Countries.java:91 +msgid "Guyana" +msgstr "" + +#: ../java/build/Countries.java:92 +msgid "Hong Kong" +msgstr "" + +#: ../java/build/Countries.java:93 +msgid "Honduras" +msgstr "" + +#: ../java/build/Countries.java:94 +msgid "Croatia" +msgstr "" + +#: ../java/build/Countries.java:95 +msgid "Haiti" +msgstr "" + +#: ../java/build/Countries.java:96 +msgid "Hungary" +msgstr "" + +#: ../java/build/Countries.java:97 +msgid "Indonesia" +msgstr "" + +#: ../java/build/Countries.java:98 +msgid "Ireland" +msgstr "" + +#: ../java/build/Countries.java:99 +msgid "Israel" +msgstr "" + +#: ../java/build/Countries.java:101 +msgid "India" +msgstr "" + +#: ../java/build/Countries.java:102 +msgid "British Indian Ocean Territory" +msgstr "" + +#: ../java/build/Countries.java:103 +msgid "Iraq" +msgstr "Irak" + +#: ../java/build/Countries.java:104 +msgid "Islamic Republic of Iran" +msgstr "Iran" + +#: ../java/build/Countries.java:105 +msgid "Iceland" +msgstr "Island" + +#: ../java/build/Countries.java:106 +msgid "Italy" +msgstr "Italien" + +#: ../java/build/Countries.java:108 +msgid "Jamaica" +msgstr "" + +#: ../java/build/Countries.java:109 +msgid "Jordan" +msgstr "" + +#: ../java/build/Countries.java:110 +msgid "Japan" +msgstr "" + +#: ../java/build/Countries.java:111 +msgid "Kenya" +msgstr "" + +#: ../java/build/Countries.java:112 +msgid "Kyrgyzstan" +msgstr "" + +#: ../java/build/Countries.java:113 +msgid "Cambodia" +msgstr "" + +#: ../java/build/Countries.java:114 +msgid "Kiribati" +msgstr "" + +#: ../java/build/Countries.java:115 +msgid "Comoros" +msgstr "" + +#: ../java/build/Countries.java:116 +msgid "Saint Kitts and Nevis" +msgstr "" + +#: ../java/build/Countries.java:117 +msgid "Republic of Korea" +msgstr "" + +#: ../java/build/Countries.java:118 +msgid "Kuwait" +msgstr "" + +#: ../java/build/Countries.java:119 +msgid "Cayman Islands" +msgstr "" + +#: ../java/build/Countries.java:120 +msgid "Kazakhstan" +msgstr "" + +#: ../java/build/Countries.java:121 +msgid "Lao People's Democratic Republic" +msgstr "" + +#: ../java/build/Countries.java:122 +msgid "Lebanon" +msgstr "" + +#: ../java/build/Countries.java:123 +msgid "Saint Lucia" +msgstr "" + +#: ../java/build/Countries.java:124 +msgid "Liechtenstein" +msgstr "" + +#: ../java/build/Countries.java:125 +msgid "Sri Lanka" +msgstr "" + +#: ../java/build/Countries.java:126 +msgid "Liberia" +msgstr "" + +#: ../java/build/Countries.java:127 +msgid "Lesotho" +msgstr "" + +#: ../java/build/Countries.java:128 +msgid "Lithuania" +msgstr "" + +#: ../java/build/Countries.java:129 +msgid "Luxembourg" +msgstr "" + +#: ../java/build/Countries.java:130 +msgid "Latvia" +msgstr "" + +#: ../java/build/Countries.java:131 +msgid "Libyan Arab Jamahiriya" +msgstr "" + +#: ../java/build/Countries.java:132 +msgid "Morocco" +msgstr "" + +#: ../java/build/Countries.java:133 +msgid "Monaco" +msgstr "" + +#: ../java/build/Countries.java:134 +msgid "Republic of Moldova" +msgstr "" + +#: ../java/build/Countries.java:137 +msgid "Madagascar" +msgstr "" + +#: ../java/build/Countries.java:138 +msgid "Marshall Islands" +msgstr "" + +#: ../java/build/Countries.java:139 +msgid "The Former Yugoslav Republic of Macedonia" +msgstr "" + +#: ../java/build/Countries.java:140 +msgid "Mali" +msgstr "" + +#: ../java/build/Countries.java:141 +msgid "Myanmar" +msgstr "" + +#: ../java/build/Countries.java:142 +msgid "Mongolia" +msgstr "" + +#: ../java/build/Countries.java:143 +msgid "Macao" +msgstr "" + +#: ../java/build/Countries.java:144 +msgid "Northern Mariana Islands" +msgstr "" + +#: ../java/build/Countries.java:145 +msgid "Martinique" +msgstr "" + +#: ../java/build/Countries.java:146 +msgid "Mauritania" +msgstr "" + +#: ../java/build/Countries.java:147 +msgid "Montserrat" +msgstr "" + +#: ../java/build/Countries.java:148 +msgid "Malta" +msgstr "" + +#: ../java/build/Countries.java:149 +msgid "Mauritius" +msgstr "" + +#: ../java/build/Countries.java:150 +msgid "Maldives" +msgstr "" + +#: ../java/build/Countries.java:151 +msgid "Malawi" +msgstr "" + +#: ../java/build/Countries.java:152 +msgid "Mexico" +msgstr "" + +#: ../java/build/Countries.java:153 +msgid "Malaysia" +msgstr "" + +#: ../java/build/Countries.java:154 +msgid "Mozambique" +msgstr "" + +#: ../java/build/Countries.java:155 +msgid "Namibia" +msgstr "" + +#: ../java/build/Countries.java:156 +msgid "New Caledonia" +msgstr "" + +#: ../java/build/Countries.java:157 +msgid "Niger" +msgstr "" + +#: ../java/build/Countries.java:158 +msgid "Norfolk Island" +msgstr "" + +#: ../java/build/Countries.java:159 +msgid "Nigeria" +msgstr "" + +#: ../java/build/Countries.java:160 +msgid "Nicaragua" +msgstr "" + +#: ../java/build/Countries.java:161 +msgid "Netherlands" +msgstr "" + +#: ../java/build/Countries.java:162 +msgid "Norway" +msgstr "" + +#: ../java/build/Countries.java:163 +msgid "Nepal" +msgstr "" + +#: ../java/build/Countries.java:164 +msgid "Nauru" +msgstr "" + +#: ../java/build/Countries.java:165 +msgid "Niue" +msgstr "" + +#: ../java/build/Countries.java:166 +msgid "New Zealand" +msgstr "" + +#: ../java/build/Countries.java:167 +msgid "Oman" +msgstr "" + +#: ../java/build/Countries.java:168 +msgid "Panama" +msgstr "" + +#: ../java/build/Countries.java:169 +msgid "Peru" +msgstr "" + +#: ../java/build/Countries.java:170 +msgid "French Polynesia" +msgstr "" + +#: ../java/build/Countries.java:171 +msgid "Papua New Guinea" +msgstr "" + +#: ../java/build/Countries.java:172 +msgid "Philippines" +msgstr "" + +#: ../java/build/Countries.java:173 +msgid "Pakistan" +msgstr "" + +#: ../java/build/Countries.java:174 +msgid "Poland" +msgstr "" + +#: ../java/build/Countries.java:175 +msgid "Saint Pierre and Miquelon" +msgstr "" + +#: ../java/build/Countries.java:176 +msgid "Puerto Rico" +msgstr "" + +#: ../java/build/Countries.java:177 +msgid "Palestinian Territory" +msgstr "" + +#: ../java/build/Countries.java:178 +msgid "Portugal" +msgstr "" + +#: ../java/build/Countries.java:179 +msgid "Palau" +msgstr "" + +#: ../java/build/Countries.java:180 +msgid "Paraguay" +msgstr "" + +#: ../java/build/Countries.java:181 +msgid "Qatar" +msgstr "" + +#: ../java/build/Countries.java:182 +msgid "Reunion" +msgstr "" + +#: ../java/build/Countries.java:183 +msgid "Romania" +msgstr "" + +#: ../java/build/Countries.java:184 +msgid "Serbia" +msgstr "" + +#: ../java/build/Countries.java:185 +msgid "Russian Federation" +msgstr "" + +#: ../java/build/Countries.java:186 +msgid "Rwanda" +msgstr "" + +#: ../java/build/Countries.java:187 +msgid "Saudi Arabia" +msgstr "" + +#: ../java/build/Countries.java:188 +msgid "Solomon Islands" +msgstr "" + +#: ../java/build/Countries.java:189 +msgid "Seychelles" +msgstr "" + +#: ../java/build/Countries.java:190 +msgid "Sudan" +msgstr "" + +#: ../java/build/Countries.java:191 +msgid "Sweden" +msgstr "" + +#: ../java/build/Countries.java:192 +msgid "Singapore" +msgstr "" + +#: ../java/build/Countries.java:193 +msgid "Slovenia" +msgstr "" + +#: ../java/build/Countries.java:194 +msgid "Slovakia" +msgstr "" + +#: ../java/build/Countries.java:195 +msgid "Sierra Leone" +msgstr "" + +#: ../java/build/Countries.java:196 +msgid "San Marino" +msgstr "" + +#: ../java/build/Countries.java:197 +msgid "Senegal" +msgstr "" + +#: ../java/build/Countries.java:198 +msgid "Somalia" +msgstr "" + +#: ../java/build/Countries.java:199 +msgid "Suriname" +msgstr "" + +#: ../java/build/Countries.java:200 +msgid "Sao Tome and Principe" +msgstr "" + +#: ../java/build/Countries.java:201 +msgid "El Salvador" +msgstr "" + +#: ../java/build/Countries.java:202 +msgid "Syrian Arab Republic" +msgstr "" + +#: ../java/build/Countries.java:203 +msgid "Swaziland" +msgstr "" + +#: ../java/build/Countries.java:204 +msgid "Turks and Caicos Islands" +msgstr "" + +#: ../java/build/Countries.java:205 +msgid "Chad" +msgstr "Tschad" + +#: ../java/build/Countries.java:206 +msgid "French Southern Territories" +msgstr "" + +#: ../java/build/Countries.java:207 +msgid "Togo" +msgstr "" + +#: ../java/build/Countries.java:208 +msgid "Thailand" +msgstr "" + +#: ../java/build/Countries.java:209 +msgid "Tajikistan" +msgstr "" + +#: ../java/build/Countries.java:210 +msgid "Tokelau" +msgstr "" + +#: ../java/build/Countries.java:211 +msgid "Timor-Leste" +msgstr "" + +#: ../java/build/Countries.java:212 +msgid "Turkmenistan" +msgstr "" + +#: ../java/build/Countries.java:213 +msgid "Tunisia" +msgstr "" + +#: ../java/build/Countries.java:214 +msgid "Tonga" +msgstr "" + +#: ../java/build/Countries.java:215 +msgid "Turkey" +msgstr "" + +#: ../java/build/Countries.java:216 +msgid "Trinidad and Tobago" +msgstr "" + +#: ../java/build/Countries.java:217 +msgid "Tuvalu" +msgstr "" + +#: ../java/build/Countries.java:218 +msgid "Taiwan" +msgstr "" + +#: ../java/build/Countries.java:219 +msgid "United Republic of Tanzania" +msgstr "" + +#: ../java/build/Countries.java:220 +msgid "Ukraine" +msgstr "" + +#: ../java/build/Countries.java:221 +msgid "Uganda" +msgstr "" + +#: ../java/build/Countries.java:222 +msgid "United States Minor Outlying Islands" +msgstr "" + +#: ../java/build/Countries.java:223 +msgid "United States" +msgstr "" + +#: ../java/build/Countries.java:224 +msgid "Uruguay" +msgstr "" + +#: ../java/build/Countries.java:225 +msgid "Uzbekistan" +msgstr "" + +#: ../java/build/Countries.java:226 +msgid "Holy See (Vatican City State)" +msgstr "" + +#: ../java/build/Countries.java:227 +msgid "Saint Vincent and the Grenadines" +msgstr "" + +#: ../java/build/Countries.java:228 +msgid "Venezuela" +msgstr "" + +#: ../java/build/Countries.java:229 ../java/build/Countries.java:230 +msgid "Virgin Islands" +msgstr "" + +#: ../java/build/Countries.java:231 +msgid "Viet Nam" +msgstr "" + +#: ../java/build/Countries.java:232 +msgid "Vanuatu" +msgstr "" + +#: ../java/build/Countries.java:233 +msgid "Wallis and Futuna" +msgstr "" + +#: ../java/build/Countries.java:234 +msgid "Samoa" +msgstr "" + +#: ../java/build/Countries.java:235 +msgid "Yemen" +msgstr "" + +#: ../java/build/Countries.java:236 +msgid "Mayotte" +msgstr "" + +#: ../java/build/Countries.java:237 +msgid "South Africa" +msgstr "" + +#: ../java/build/Countries.java:238 +msgid "Zambia" +msgstr "" + +#: ../java/build/Countries.java:239 +msgid "Zimbabwe" +msgstr "" + +#: ../java/src/net/i2p/router/web/CSSHelper.java:41 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:26 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:28 +#: ../java/strings/Strings.java:29 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/index_jsp.java:234 +msgid "I2P Router Console" +msgstr "I2P Router Konsole" + +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:57 +msgid "Error updating the configuration - please see the error logs" +msgstr "Fehler beim Aktualisieren der Einstellungen - bitte schaue in den Fehlerberichten nach" + +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:69 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:251 +msgid "Configuration saved successfully" +msgstr "Einstellungen erfolgreich gespeichert" + +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:253 +msgid "" +"Error saving the configuration (applied but not saved) - please see the " +"error logs" +msgstr "" +"Fehler beim Speichern der Einstellungen (angewendet aber nicht gespeichert) - bitte schaue in den Fehlerberichten nach" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:32 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:321 +msgid "Save Client Configuration" +msgstr "Speichere Klient Einstellungen" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:36 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:333 +msgid "Save WebApp Configuration" +msgstr "Speichere WebApplikations Einstellungen" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:54 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:67 +msgid "Start" +msgstr "Start" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:68 +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:49 +msgid "Unsupported" +msgstr "Nicht unterstützt" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:83 +msgid "" +"Client configuration saved successfully - restart required to take effect." +msgstr "Klient Einstellungen erfolgreich gespeichert - Neustart zum Übernehmen erforderlich" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:89 +msgid "Bad client index." +msgstr "Falscher Index für den Klienten" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:94 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:17 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:359 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:371 +msgid "Client" +msgstr "Klient" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:94 +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:129 +msgid "started" +msgstr "gestartet" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:111 +msgid "" +"WebApp configuration saved successfully - restart required to take effect." +msgstr "WebApplikationseinstellungen erfolgreich gespeichert - Neustart zum Übernehmen erforderlich" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:129 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:34 +msgid "WebApp" +msgstr "WebApplikation" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:131 +msgid "Failed to start" +msgstr "Fehler beim Starten" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:137 +msgid "Failed to find server." +msgstr "Konnte keinen Server finden" + +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:17 +msgid "Class and arguments" +msgstr "Klasse und Argumente" + +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:17 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:34 +msgid "Run at Startup?" +msgstr "Beim Starten des Systems mitstarten?" + +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:17 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:34 +msgid "Start Now" +msgstr "Starte jetzt" + +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:34 +msgid "Description" +msgstr "Beschreibung" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:18 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:320 +msgid "Add key" +msgstr "Füge Schlüssel hinzu" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:19 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:322 +msgid "Delete key" +msgstr "Lösche Schlüssel" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:21 +msgid "You must enter a destination" +msgstr "Eingabe einer Destination erforderlich" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:23 +msgid "You must enter a key" +msgstr "Eingabe eines Schlüssels erforderlich" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:34 +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:41 +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:43 +msgid "Key for" +msgstr "Schlüssel für" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:34 +msgid "added to keyring" +msgstr "dem Schlüsselring hinzugefügt" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:36 +msgid "Invalid destination or key" +msgstr "Ungültige Destination oder Schlüssel" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:41 +msgid "removed from keyring" +msgstr "vom Schlüsselring gelöscht" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:43 +msgid "not found in keyring" +msgstr "nicht im Schlüsselring gefunden" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:45 +msgid "Invalid destination" +msgstr "Ungültige Destination" + +#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52 +msgid "CRIT" +msgstr "KRITISCH" + +#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52 +msgid "DEBUG" +msgstr "DEBUG" + +#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52 +msgid "ERROR" +msgstr "FEHLER" + +#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52 +msgid "INFO" +msgstr "INFO" + +#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52 +msgid "WARN" +msgstr "WARNUNG" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18 +msgid "Network" +msgstr "Netzwerk" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18 +msgid "Service" +msgstr "Service" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:82 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:253 +msgid "Tunnels" +msgstr "Tunnel" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18 +msgid "UI" +msgstr "Oberfläche" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:205 +msgid "Update" +msgstr "Aktualisierung" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 +msgid "Clients" +msgstr "Klienten" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:292 +msgid "Keyring" +msgstr "Schlüsselring" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 +msgid "Logging" +msgstr "Statusmitschnitt" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:88 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 +msgid "Peers" +msgstr "Kontakt" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:293 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:124 +msgid "Stats" +msgstr "Statistiken" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20 +msgid "Advanced" +msgstr "Erweitert" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:47 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:35 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:357 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:494 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:333 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:373 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:341 +msgid "Save changes" +msgstr "Speichere die Änderungen" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:119 +msgid "Rechecking router reachability..." +msgstr "Prüfe Erreichbarket des Routers nochmal..." + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:148 +msgid "Updating IP address" +msgstr "Aktualisiere die IP Adresse" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:166 +msgid "Disabling TCP completely" +msgstr "Deaktiviere TCP komplett" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:170 +msgid "Updating inbound TCP address to" +msgstr "Aktualisiere eingehende TCP Adresse auf" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:174 +msgid "Disabling inbound TCP" +msgstr "Deaktiviere eingehenden TCP" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:176 +msgid "Updating inbound TCP address to auto" +msgstr "Aktualisiere eigehende TCP Adresse auf automatisch" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:185 +msgid "Updating inbound TCP port to" +msgstr "Aktualisiere eingehenden TCP Port auf" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:188 +msgid "Updating inbound TCP port to auto" +msgstr "Aktualisiere eingehenden TCP Port auf automatisch" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:200 +msgid "Updating UDP port from" +msgstr "Aktualisiere UDP Port von" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:200 +msgid "to" +msgstr "auf" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:216 +msgid "Gracefully restarting into Hidden Router Mode" +msgstr "Starte sanft neu in den Verborgenen Router Modus" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:218 +msgid "Gracefully restarting to exit Hidden Router Mode" +msgstr "Starte sanft neu um den Verborgenen Router Modus zu verlassen" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:227 +msgid "Enabling UPnP, restart required to take effect" +msgstr "Aktivere UPnP, Neustart benötigt um wirksam zu werden" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:229 +msgid "Disabling UPnP, restart required to take effect" +msgstr "Deaktiviere UPnP, Neustart benötigt um wirksam zu werden" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:235 +msgid "Requiring SSU introduers" +msgstr "Benötige SSU Hilfsrouter" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:275 +msgid "Gracefully restarting I2P to change published router address" +msgstr "Starte sanft I2P neu um die publizierte Router Adresse zu ändern" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:293 +msgid "Updating bandwidth share percentage" +msgstr "Aktualisiere den Anteil der zur Verfügung gestellter Bandbreite" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:363 +msgid "Updated bandwidth limits" +msgstr "Aktualisiere die Bandbreitenlimits" + +#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:39 +#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:47 +#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:50 +#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:57 +#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:60 +msgid "unknown" +msgstr "unbekannt" + +#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:165 +msgid "bits per second" +msgstr "Bits pro Sekunde" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:20 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:314 +msgid "Ban peer until restart" +msgstr "Verbanne den Kontakt bis zum Neustart" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:23 +#, java-format +msgid "Manually banned via {0}" +msgstr "Manuell gebannt über {0}" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:24 +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:33 +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:35 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:187 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:235 +msgid "Peer" +msgstr "Kontakt" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:24 +msgid "banned until restart" +msgstr "gebannt bis zum Neustart" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:27 +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:38 +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:59 +msgid "Invalid peer" +msgstr "Ungültiger Kontakt" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:28 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:316 +msgid "Unban peer" +msgstr "Hebe die Verbannung des Kontaktes auf" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:33 +msgid "unbanned" +msgstr "nicht mehr gebannt" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:35 +msgid "is not currently banned" +msgstr "ist zur Zeit nicht gebannt" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:39 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:322 +msgid "Adjust Profile Bonuses" +msgstr "korrigiere Profilboni" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:47 +msgid "Bad speed value" +msgstr "Ungültige Geschwindigkeitsangabe" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:52 +msgid "Bad capacity value" +msgstr "Ungültiger Wert zur Kapazität" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:32 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:57 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:292 +msgid "Shutdown immediately" +msgstr "Beende I2P sofort" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:36 +msgid "Cancel shutdown" +msgstr "Beende I2P doch nicht" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:37 +msgid "Cancel restart" +msgstr "Starte I2P doch nicht neu" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:39 +msgid "Restart immediately" +msgstr "Starte sofort neu" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:43 +msgid "Restart" +msgstr "Neustart" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:46 +msgid "Shutdown" +msgstr "I2P beenden" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:57 +msgid "Shutdown imminent" +msgstr "Sofort I2P beenden" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:60 +#, java-format +msgid "Shutdown in {0}" +msgstr "Ende in {0}" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:65 +#, java-format +msgid "Restart in {0}" +msgstr "Neustart in {0}" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:53 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:290 +msgid "Shutdown gracefully" +msgstr "Sanft herunterfahren" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:56 +msgid "Graceful shutdown initiated" +msgstr "Sanftes Herunterfahren gestartet" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:60 +msgid "Shutdown immediately! boom bye bye bad bwoy" +msgstr "Beende I2P sofort! BOOM, bye bye bad boy" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:61 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:294 +msgid "Cancel graceful shutdown" +msgstr "Sanftes Herunterfahren stoppen" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:63 +msgid "Graceful shutdown cancelled" +msgstr "Sanftes Herunterfahren gestoppt" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:64 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:308 +msgid "Graceful restart" +msgstr "Sanfter Neustart" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:67 +msgid "Graceful restart requested" +msgstr "Sanfter Neustart angefordert" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:68 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:310 +msgid "Hard restart" +msgstr "Harter Neustart" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:71 +msgid "Hard restart requested" +msgstr "Harter Neustart angefordert" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:72 +msgid "Rekey and Restart" +msgstr "Hole neue RouterID und starte neu" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:73 +msgid "Rekeying after graceful restart" +msgstr "Neue RouterID nach sanftem Neustart" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:76 +msgid "Rekey and Shutdown" +msgstr "Neue RouterID und I2P beenden" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:77 +msgid "Rekeying after graceful shutdown" +msgstr "Neue RouterID nach sanftem Herunterfahren" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:80 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:338 +msgid "Run I2P on startup" +msgstr "Starte I2P beim Systemstart" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:82 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:340 +msgid "Don't run I2P on startup" +msgstr "Starte I2P nicht beim Systemstart" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:84 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:356 +msgid "Dump threads" +msgstr "Gebe Threadliste aus" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:91 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:324 +msgid "Show systray icon" +msgstr "Zeige Systemtray Icon" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:96 +msgid "System tray icon enabled." +msgstr "Systemtray Icon aktiviert" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:98 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:110 +msgid "System tray icon feature not supported on this platform. Sorry!" +msgstr "Systemtry Icon wird auf diesem System nicht unterstützt. Sorry!" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:101 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:113 +msgid "Warning: unable to contact the systray manager" +msgstr "Warnung: kann den Systemtray Manager nicht erreichen" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:103 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:326 +msgid "Hide systray icon" +msgstr "Verstecke das Systemtray Icon" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:108 +msgid "System tray icon disabled." +msgstr "Systemtry Icon deaktiviert" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:115 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:364 +msgid "View console on startup" +msgstr "Zeige die Konsole beim Starten" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:117 +msgid "Console is to be shown on startup" +msgstr "Konsole wird beim Starten angezeigt" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:118 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:366 +msgid "Do not view console on startup" +msgstr "Zeige Konsole beim Starten nicht" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:120 +msgid "Console is not to be shown on startup" +msgstr "Konsole wird beim Starten nicht gezeigt" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:129 +msgid "Service installed" +msgstr "Service wurde installiert" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:131 +msgid "Warning: unable to install the service" +msgstr "Warnung: Service konnte nicht installiert werden" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:137 +msgid "Service removed" +msgstr "Service wurde entfernt" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:139 +msgid "Warning: unable to remove the service" +msgstr "Warnung: Service konnte nicht entfernt werden" + +#: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:118 +msgid "Stat filter and location updated successfully to" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:120 +msgid "Failed to update the stat filter and location" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:121 +msgid "" +"Graph list updated, may take up to 60s to be reflected here and on the Graphs Page" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:137 +msgid "Updated settings for all pools." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:142 +msgid "Exploratory tunnel configuration saved successfully." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:144 +#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:36 +msgid "" +"Error saving the configuration (applied but not saved) - please see the " +"error logs." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:11 +msgid "hop" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:12 +msgid "tunnel" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:14 +msgid "hops" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:15 +msgid "tunnels" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:26 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:40 +msgid "Exploratory tunnels" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:46 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:60 +msgid "Client tunnels for" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:69 +msgid "ANONYMITY WARNING - Settings include 0-hop tunnels." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:74 +msgid "ANONYMITY WARNING - Settings include 1-hop tunnels." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:77 +msgid "PERFORMANCE WARNING - Settings include very long tunnels." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:80 +msgid "PERFORMANCE WARNING - Settings include high tunnel quantities." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:82 +msgid "Inbound" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:82 +msgid "Outbound" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:87 +msgid "Depth" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:104 +msgid "Randomization" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:128 +msgid "Quantity" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:145 +msgid "Backup quantity" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:167 +msgid "Inbound options" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:180 +msgid "Outbound options" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:31 +msgid "Theme change saved." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:33 +msgid "Refresh the page to view." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:41 +msgid "English" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:41 +msgid "French" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:41 +msgid "German" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:42 +msgid "Chinese" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:42 +msgid "Dutch" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:42 +msgid "Russian" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:42 +msgid "Swedish" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:56 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:310 +msgid "Check for updates" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:63 +msgid "Update available, attempting to download now" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:65 +msgid "Update available, click button on left to download" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:67 +msgid "No update available" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:75 +msgid "Updating news URL to" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:83 +msgid "Updating proxy host to" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:91 +msgid "Updating proxy port to" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:104 +msgid "Updating refresh frequency to" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:111 +msgid "Updating update policy to" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:120 +msgid "Updating update URLs." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:128 +msgid "Updating trusted keys." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:136 +msgid "Updating unsigned update URL to" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:75 +#: ../java/src/net/i2p/router/web/GraphHelper.java:115 +msgid "Never" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:77 +msgid "Every" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:90 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:92 +msgid "Notify only" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:95 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:97 +msgid "Download and verify only" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:101 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:103 +msgid "Download, verify, and restart" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:107 +msgid "Configure Graph Display" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:107 +msgid "Select Stats" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:109 +msgid "Periods" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:110 +msgid "Plot averages" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:111 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:405 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:336 +msgid "or" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:111 +msgid "plot events" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:112 +msgid "Image sizes" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:112 +msgid "width" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:113 +msgid "height" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:113 +#: ../java/src/net/i2p/router/web/GraphHelper.java:114 +msgid "pixels" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:115 +msgid "Refresh delay" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:115 +msgid "hour" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:115 +msgid "minute" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:115 +msgid "minutes" +msgstr "" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:116 +msgid "Redraw" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:59 +msgid "Network Database RouterInfo Lookup" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:74 +msgid "Router" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:74 +msgid "not found in network database" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:82 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:134 +msgid "Network Database Contents" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:83 +msgid "View RouterInfo" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:84 +msgid "LeaseSets" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92 +msgid "LeaseSet" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:94 +msgid "Local" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +msgid "Unpublished" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:97 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:104 +msgid "Destination" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:114 +#, java-format +msgid "Expires in {0}" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:116 +#, java-format +msgid "Expired {0} ago" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:118 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:156 +msgid "Gateway" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:118 +msgid "Lease" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:120 +msgid "Tunnel" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:134 +msgid "View LeaseSets" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:136 +msgid "Not initialized" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:145 +msgid "Routers" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:147 +msgid "Show all routers" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:149 +msgid "Show all routers with full stats" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184 +msgid "Network Database Router Statistics" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:204 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:222 +msgid "Count" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +msgid "Version" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:204 +msgid "Transports" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:222 +msgid "Country" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:254 +msgid "Our info" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:256 +msgid "Peer info for" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:260 +msgid "Full entry" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:96 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:581 +msgid "Hidden" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:266 +msgid "Updated" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:267 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:270 +#, java-format +msgid "{0} ago" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:269 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:273 +msgid "Published" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:275 +msgid "Address(es)" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:308 +msgid "Hidden or starting up" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:308 +msgid "SSU" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:308 +msgid "SSU with introducers" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:309 +msgid "NTCP" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:309 +msgid "NTCP and SSU" +msgstr "" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:309 +msgid "NTCP and SSU with introducers" +msgstr "" + +#: ../java/src/net/i2p/router/web/NewsFetcher.java:80 +#, java-format +msgid "News last updated {0} ago." +msgstr "" + +#: ../java/src/net/i2p/router/web/NewsFetcher.java:86 +#, java-format +msgid "News last checked {0} ago." +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:72 +msgid "Peer Profiles" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:73 +#, java-format +msgid "Showing {0} recent profiles." +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:75 +#, java-format +msgid "Hiding {0} older profiles." +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:77 +#, java-format +msgid "Hiding {0} standard profiles." +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:82 +msgid "Groups (Caps)" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:83 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:251 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:334 +msgid "Speed" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:84 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:253 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:338 +msgid "Capacity" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:85 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:255 +msgid "Integration" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:86 +msgid "Status" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:126 +msgid "Fast, High Capacity" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:127 +msgid "High Capacity" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:128 +msgid "Standard" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:129 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:163 +msgid "Failing" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:249 +msgid "Integrated" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:162 +msgid "Banned" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:164 +msgid "Unreachable" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:171 +msgid "Test Fails" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:175 +msgid "profile" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:184 +msgid "Floodfill and Integrated Peers" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:188 +msgid "Caps" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:189 +msgid "Integ. Value" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:190 +msgid "Last Heard About" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:191 +msgid "Last Heard From" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:192 +msgid "Last Good Send" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:193 +msgid "Last Bad Send" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:194 +msgid "10m Resp. Time" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:195 +msgid "1h Resp. Time" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:196 +msgid "1d Resp. Time" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:197 +msgid "Last Good Lookup" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:198 +msgid "Last Bad Lookup" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:199 +msgid "Last Good Store" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200 +msgid "Last Bad Store" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:201 +msgid "1h Fail Rate" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202 +msgid "1d Fail Rate" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:250 +msgid "Thresholds" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:252 +msgid "fast peers" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:254 +msgid "high capacity peers" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:256 +msgid " well integrated peers" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:257 +msgid "Definitions" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:258 +msgid "as determined by the profile organizer" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:258 +msgid "groups" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 +msgid "capabilities in the netDb, not used to determine profiles" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 +msgid "caps" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 +msgid "" +"peak throughput (bytes per second) over a 1 minute period that the peer has " +"sustained in a single tunnel" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 +msgid "speed" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 +msgid "capacity" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 +msgid "how many tunnels can we ask them to join in an hour?" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 +msgid "how many new peers have they told us about lately?" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 +msgid "integration" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 +msgid "is the peer banned, or unreachable, or failing tunnel tests?" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 +msgid "status" +msgstr "" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:321 +msgid "n/a" +msgstr "" + +#: ../java/src/net/i2p/router/web/ShitlistRenderer.java:57 +#, java-format +msgid "Temporary ban expiring in {0}" +msgstr "" + +#: ../java/src/net/i2p/router/web/ShitlistRenderer.java:59 +#, java-format +msgid "Banned until restart or in {0}" +msgstr "" + +#: ../java/src/net/i2p/router/web/ShitlistRenderer.java:71 +msgid "unban now" +msgstr "" + +#: ../java/src/net/i2p/router/web/StatsGenerator.java:58 +msgid "Statistics gathered during this router's uptime" +msgstr "" + +#: ../java/src/net/i2p/router/web/StatsGenerator.java:61 +msgid "" +"The data gathered is quantized over a 1 minute period, so should just be " +"used as an estimate." +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:40 +msgid "" +"Configure startup of clients and webapps (services); manually start dormant " +"services" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:42 +msgid "I2P Services" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:48 +msgid "Manage your I2P hosts file here (I2P domain name resolution)" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:50 +msgid "Addressbook" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:54 +msgid "Built-in anonymous BitTorrent Client" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:56 +msgid "Torrents" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:60 +msgid "Anonymous webmail client" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:62 +msgid "Webmail" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:66 +msgid "Anonymous resident webserver" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:68 +msgid "Webserver" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:72 +msgid "Configure I2P Router" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:74 +msgid "I2P Internals" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:80 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:344 +msgid "View existing tunnels and tunnel build status" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:86 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 +msgid "Show all current peer connections" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:92 +msgid "Show recent peer performance profiles" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:94 +msgid "Profiles" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:98 +msgid "Show list of all known I2P routers" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:100 +msgid "NetDB" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:104 +msgid "Health Report" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:106 +msgid "Logs" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:110 +msgid "Show the router's workload, and how it's performing" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:112 +msgid "Jobs" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:116 +msgid "Graph router performance" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:118 +msgid "Graphs" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +msgid "Textual router performance statistics" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:134 +msgid "I2P Router Help" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:136 +msgid "General" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 +msgid "Your unique I2P router identity is" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:143 +msgid "never reveal it to anyone" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 +msgid "Local Identity" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 +msgid "How long we've been running for this session" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160 +msgid "Uptime" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:167 +msgid "" +"Help with configuring your firewall and router for optimal I2P performance" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194 +msgid "Download" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 +msgid "Download Unsigned" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 +msgid "Active" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:237 +msgid "Fast" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:243 +msgid "High capacity" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:255 +msgid "Known" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 +msgid "Help with firewall configuration" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:272 +msgid "Check NAT/firewall" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292 +msgid "Reseed" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +msgid "Configure router bandwidth allocation" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 +msgid "Bandwidth in/out" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 +msgid "Total" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:336 +msgid "Used" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +msgid "Tunnels in/out" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 +msgid "Exploratory" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 +msgid "Participating" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +msgid "What's in the router's job queue?" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:375 +msgid "Congestion" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:380 +msgid "Job lag" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:386 +msgid "Message delay" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:392 +msgid "Tunnel lag" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:398 +msgid "Backlog" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:73 +msgid "skew" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:92 +msgid "ERR-Client Manager I2CP Error - check logs" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:94 +msgid "ERR-ClockSkew" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:103 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:557 +msgid "OK" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:104 +msgid "ERR-Private TCP Address" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:106 +msgid "ERR-SymmetricNAT" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:109 +msgid "WARN-Firewalled with Inbound TCP Enabled" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:111 +msgid "WARN-Firewalled and Floodfill" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:113 +msgid "WARN-Firewalled and Fast" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:114 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:561 +msgid "Firewalled" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:116 +msgid "" +"ERR-UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and " +"restart" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:123 +msgid "ERR-UDP Disabled and Inbound TCP host/port not set" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:125 +msgid "WARN-Firewalled with UDP Disabled" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:127 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:577 +msgid "Testing" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:360 +msgid "Add/remove/edit & control your client and server tunnels" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:360 +msgid "Local Destinations" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:369 +msgid "Server" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:373 +msgid "Show tunnels" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:384 +msgid "Leases expired" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:384 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:385 +msgid "Rebuilding" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:385 +msgid "ago" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:388 +msgid "Ready" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:392 +msgid "Building" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:392 +msgid "Building tunnels" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:404 +#: ../java/strings/Strings.java:36 +msgid "shared clients" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:40 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:62 +msgid "configure" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:64 +msgid "dead" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70 +msgid "Participating tunnels" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71 +msgid "From" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71 +msgid "Receive on" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 +msgid "Expiration" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 +msgid "Send on" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 +msgid "To" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73 +msgid "Rate" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73 +msgid "Role" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:156 +msgid "Usage" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:107 +msgid "grace period" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:117 +msgid "Outbound Endpoint" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:119 +msgid "Inbound Gateway" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:121 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 +msgid "Participant" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:126 +msgid "Inactive participating tunnels" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:127 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:216 +msgid "Lifetime bandwidth usage" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:156 +msgid "Expiry" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:156 +msgid "In/Out" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:159 +msgid "Participants" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:165 +msgid "Endpoint" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:205 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211 +msgid "Build in progress" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:205 +msgid "inbound" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211 +msgid "outbound" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:215 +msgid "No tunnels; waiting for the grace period to end." +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:216 +msgid "in" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:217 +msgid "out" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:234 +msgid "Tunnel Counts By Peer" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:235 +msgid "% of total" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:235 +msgid "Expl. + Client" +msgstr "" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:235 +msgid "Part. from + to" +msgstr "" + +#: ../java/strings/Strings.java:12 +msgid "addressbook" +msgstr "" + +#: ../java/strings/Strings.java:13 +msgid "i2psnark" +msgstr "" + +#: ../java/strings/Strings.java:14 +msgid "i2ptunnel" +msgstr "" + +#: ../java/strings/Strings.java:15 +msgid "susimail" +msgstr "" + +#: ../java/strings/Strings.java:16 +msgid "susidns" +msgstr "" + +#: ../java/strings/Strings.java:17 +msgid "routerconsole" +msgstr "" + +#: ../java/strings/Strings.java:22 +msgid "Web console" +msgstr "" + +#: ../java/strings/Strings.java:23 +msgid "SAM application bridge" +msgstr "" + +#: ../java/strings/Strings.java:24 +msgid "Application tunnels" +msgstr "" + +#: ../java/strings/Strings.java:25 +msgid "My eepsite web server" +msgstr "" + +#: ../java/strings/Strings.java:26 +msgid "I2P webserver (eepsite)" +msgstr "" + +#: ../java/strings/Strings.java:27 +msgid "Browser launch at startup" +msgstr "" + +#: ../java/strings/Strings.java:28 +msgid "BOB application bridge" +msgstr "" + +#: ../java/strings/Strings.java:30 +msgid "Open Router Console in web browser at startup" +msgstr "" + +#: ../java/strings/Strings.java:37 +msgid "IRC proxy" +msgstr "" + +#: ../java/strings/Strings.java:38 +msgid "eepsite" +msgstr "" + +#: ../java/strings/Strings.java:39 +msgid "I2P webserver" +msgstr "" + +#: ../java/strings/Strings.java:40 +msgid "HTTP Proxy" +msgstr "" + +#: ../java/strings/Strings.java:42 +msgid "eepProxy" +msgstr "" + +#: ../java/strings/Strings.java:43 +msgid "ircProxy" +msgstr "" + +#: ../java/strings/Strings.java:45 +msgid "I2PSnark" +msgstr "" + +#: ../java/strings/Strings.java:47 +msgid "iMule" +msgstr "" + +#: ../java/strings/Strings.java:51 +msgid "classic" +msgstr "" + +#: ../java/strings/Strings.java:52 +msgid "dark" +msgstr "" + +#: ../java/strings/Strings.java:53 +msgid "light" +msgstr "" + +#: ../java/strings/Strings.java:54 +msgid "midnight" +msgstr "" + #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:106 msgid "config networking" msgstr "" @@ -41,10 +2862,9 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:216 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:216 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:220 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldstats_jsp.java:216 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:216 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:216 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summary_jsp.java:157 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:216 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:236 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:216 msgid "Refresh (s)" @@ -70,10 +2890,9 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:220 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:220 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:224 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldstats_jsp.java:220 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:220 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:220 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summary_jsp.java:161 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:220 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:239 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:220 msgid "Enable" @@ -97,64 +2916,53 @@ msgstr "" msgid "KBps In" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:313 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:317 msgid "KBps Out" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:323 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:333 msgid "Share" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:330 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:340 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:307 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:303 msgid "NOTE" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:332 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:342 #, java-format msgid "You have configured I2P to share only {0} KBps." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:335 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:345 msgid "I2P requires at least 12KBps to enable sharing. " msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:336 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:346 msgid "" "Please enable sharing (participating in tunnels) by configuring more " "bandwidth. " msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:337 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:347 msgid "" "It improves your anonymity by creating cover traffic, and helps the network." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:340 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:350 #, java-format msgid "You have configured I2P to share {0} KBps." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:343 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:353 msgid "" "The higher the share bandwidth the more you improve your anonymity and help " "the network." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:347 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:478 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:333 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:373 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:341 -#: src/net/i2p/router/web/ConfigNetHandler.java:47 -#: src/net/i2p/router/web/ConfigNetHandler.java:249 -#: src/net/i2p/router/web/ConfigTunnelsHandler.java:35 -msgid "Save changes" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:349 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:359 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:305 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:324 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:335 @@ -165,503 +2973,476 @@ msgstr "" msgid "Cancel" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:353 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:363 msgid "IP and Transport Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:355 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:365 msgid "The default settings will work for most people." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:357 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:367 msgid "There is help below." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:359 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:369 msgid "UPnP Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:363 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:373 msgid "Enable UPnP to open firewall ports" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:365 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:375 msgid "UPnP status" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:367 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:377 msgid "IP Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:369 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:425 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:379 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:441 msgid "Externally reachable hostname or IP address" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:373 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:383 msgid "Use all auto-detect methods" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:377 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:387 msgid "Disable UPnP IP address detection" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:381 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:391 msgid "Ignore local interface IP address" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:385 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:395 msgid "Use SSU IP address detection only" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:389 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:443 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:399 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:459 msgid "Specify hostname or IP" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:395 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:405 msgid "Select Interface" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:395 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:336 -#: src/net/i2p/router/web/GraphHelper.java:111 -msgid "or" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:409 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:419 msgid "Hidden mode - do not publish IP" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:411 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:421 msgid "(prevents participating traffic)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:413 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:423 msgid "UDP Configuration:" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:415 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:425 msgid "UDP port:" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:423 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:439 msgid "TCP Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:429 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:445 msgid "Use auto-detected IP address" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:431 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:463 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:447 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 msgid "currently" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:435 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:451 msgid "if we are not firewalled" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:439 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:455 msgid "Always use auto-detected IP address (Not firewalled)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:449 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:465 msgid "Disable inbound (Firewalled)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:453 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:469 msgid "Completely disable" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:455 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:471 msgid "" "(select only if behind a firewall that throttles or blocks outbound TCP)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:457 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:473 msgid "Externally reachable TCP port" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:477 msgid "Use the same port configured for UDP" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:469 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:485 msgid "Specify Port" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:473 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:342 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:329 msgid "Note" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:476 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:492 msgid "Changing these settings will restart your router." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:482 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:498 msgid "Configuration Help" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:484 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:526 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:500 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:549 msgid "" "While I2P will work fine behind most firewalls, your speeds and network " -"integration will generally improve if the I2P port (generally 8887) is " -"forwarded for both UDP and TCP." +"integration will generally improve if the I2P port is forwarded for both UDP " +"and TCP." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:502 msgid "" "If you can, please poke a hole in your firewall to allow unsolicited UDP and " "TCP packets to reach you." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:488 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:504 msgid "" "If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole " "punching with \"SSU introductions\" to relay traffic." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:490 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:506 msgid "" "Most of the options above are for special situations, for example where UPnP " "does not work correctly, or a firewall not under your control is doing harm." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:492 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:508 msgid "Certain firewalls such as symmetric NATs may not work well with I2P." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:494 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:517 msgid "" "UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect " "the external IP address and forward ports." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:496 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:519 msgid "UPnP support is beta, and may not work for any number of reasons" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:498 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:521 msgid "No UPnP-compatible device present" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:500 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:523 msgid "UPnP disabled on the device" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:502 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:525 msgid "Software firewall interference with UPnP" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:504 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:527 msgid "Bugs in the device's UPnP implementation" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:506 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:529 msgid "Multiple firewall/routers in the internet connection path" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:508 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:531 msgid "UPnP device change, reset, or address change" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:510 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:533 msgid "Review the UPnP status here." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:512 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:535 msgid "" "UPnP may be enabled or disabled above, but a change requires a router " "restart to take effect." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:514 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:537 msgid "Hostnames entered above will be published in the network database." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:516 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:539 msgid "They are not private." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:518 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:541 msgid "" "Also, do not enter a private IP address like 127.0.0.1 or 192.168.1.1." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:520 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:543 msgid "" "If you specify the wrong IP address or hostname, or do not properly " "configure your NAT or firewall, your network performance will degrade " "substantially." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:522 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:545 msgid "When in doubt, leave the settings at the defaults." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:524 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:547 msgid "Reachability Help" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:529 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:552 msgid "" "If you think you have opened up your firewall and I2P still thinks you are " "firewalled, remember that you may have multiple firewalls, for example both " "software packages and external hardware routers." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:532 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:555 msgid "" "If there is an error, the logs may also help " "diagnose the problem." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:534 -#: src/net/i2p/router/web/SummaryHelper.java:103 -msgid "OK" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:536 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:559 msgid "Your UDP port does not appear to be firewalled." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:538 -#: src/net/i2p/router/web/SummaryHelper.java:114 -msgid "Firewalled" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:540 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:563 msgid "Your UDP port appears to be firewalled." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:542 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:565 msgid "" "As the firewall detection methods are not 100% reliable, this may " "occasionally be displayed in error." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:544 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:567 msgid "" "However, if it appears consistently, you should check whether both your " -"external and internal firewalls are open on port 8887." +"external and internal firewalls are open for your port." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:546 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:569 msgid "" "I2P will work fine when firewalled, there is no reason for concern. When " "firewalled, the router uses \"introducers\" to relay inbound connections." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:548 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:571 msgid "" "However, you will get more participating traffic and help the network more " "if you can open your firewall(s)." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:550 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:573 msgid "" "If you think you have already done so, remember that you may have both a " "hardware and a software firewall, or be behind an additional, institutional " "firewall you cannot control." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:552 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:575 msgid "" "Also, some routers cannot correctly forward both TCP and UDP on a single " "port, or may have other limitations or bugs that prevent them from passing " "traffic through to I2P." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:554 -#: src/net/i2p/router/web/SummaryHelper.java:127 -msgid "Testing" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:556 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:579 msgid "The router is currently testing whether your UDP port is firewalled." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:558 -#: src/net/i2p/router/web/NetDbRenderer.java:234 -#: src/net/i2p/router/web/SummaryHelper.java:96 -msgid "Hidden" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:560 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:583 msgid "" "The router is not configured to publish its address, therefore it does not " "expect incoming connections." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:562 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:585 msgid "WARN - Firewalled and Fast" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:564 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:587 msgid "" "You have configured I2P to share more than 128KBps of bandwidth, but you are " "firewalled." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:566 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:589 msgid "" "While I2P will work fine in this configuration, if you really have over " "128KBps of bandwidth to share, it will be much more helpful to the network " "if you open your firewall." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:568 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:591 msgid "WARN - Firewalled and Floodfill" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:570 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:593 msgid "" "You have configured I2P to be a floodfill router, but you are firewalled." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:572 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:595 msgid "" "For best participation as a floodfill router, you should open your firewall." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:574 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:597 msgid "WARN - Firewalled with Inbound TCP Enabled" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:576 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:599 msgid "" "You have configured inbound TCP, however your UDP port is firewalled, and " "therefore it is likely that your TCP port is firewalled as well." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:578 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:601 msgid "" "If your TCP port is firewalled with inbound TCP enabled, routers will not be " "able to contact you via TCP, which will hurt the network." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:580 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:603 msgid "Please open your firewall or disable inbound TCP above." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:582 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:605 msgid "WARN - Firewalled with UDP Disabled" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:584 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:607 msgid "You have configured inbound TCP, however you have disabled UDP." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:586 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:609 msgid "" "You appear to be firewalled on TCP, therefore your router cannot accept " "inbound connections." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:588 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:611 msgid "Please open your firewall or enable UDP." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:590 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:613 msgid "ERR - Clock Skew" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:592 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:615 msgid "" "Your system's clock is skewed, which will make it difficult to participate " "in the network." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:594 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:617 msgid "Correct your clock setting if this error persists." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:596 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:619 msgid "ERR - Private TCP Address" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:598 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:621 msgid "" "You must never advertise an unroutable IP address such as 127.0.0.1 or " "192.168.1.1 as your external address." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:600 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:623 msgid "Correct the address or disable inbound TCP above." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:602 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:625 msgid "ERR - SymmetricNAT" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:604 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:627 msgid "I2P detected that you are firewalled by a Symmetric NAT." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:606 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:629 msgid "" "I2P does not work well behind this type of firewall. You will probably not " "be able to accept inbound connections, which will limit your participation " "in the network." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:608 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:631 msgid "" "ERR - UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config " "and restart" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:610 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:633 msgid "I2P was unable to bind to port 8887 or other configured port." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:612 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:635 msgid "" -"Check to see if another program is using port 8887. If so, stop that program " -"or configure I2P to use a different port." +"Check to see if another program is using the configured port. If so, stop " +"that program or configure I2P to use a different port." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:614 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:637 msgid "" "This may be a transient error, if the other program is no longer using the " "port." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:616 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:639 msgid "However, a restart is always required after this error." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:618 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:641 msgid "ERR - UDP Disabled and Inbound TCP host/port not set" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:620 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:643 msgid "" "You have not configured inbound TCP with a hostname and port above, however " "you have disabled UDP." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:622 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:645 msgid "Therefore your router cannot accept inbound connections." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:624 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:647 msgid "Please configure a TCP host and port above or enable UDP." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:626 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:649 msgid "ERR - Client Manager I2CP Error - check logs" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:628 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:651 msgid "This is usually due to a port 7654 conflict. Check the logs to verify." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:630 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:653 msgid "" "Do you have another I2P instance running? Stop the conflicting program and " "restart I2P." @@ -715,11 +3496,6 @@ msgstr "" msgid "All changes require restart to take effect." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:321 -#: src/net/i2p/router/web/ConfigClientsHandler.java:32 -msgid "Save Client Configuration" -msgstr "" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:323 msgid "WebApp Configuration" msgstr "" @@ -742,11 +3518,6 @@ msgid "" "preferred method." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:333 -#: src/net/i2p/router/web/ConfigClientsHandler.java:36 -msgid "Save WebApp Configuration" -msgstr "" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:106 msgid "config keyring" msgstr "" @@ -755,11 +3526,6 @@ msgstr "" msgid "I2P Keyring Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:292 -#: src/net/i2p/router/web/ConfigNavHelper.java:19 -msgid "Keyring" -msgstr "" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:294 msgid "The router keyring is used to decrypt encrypted leaseSets." msgstr "" @@ -793,16 +3559,6 @@ msgstr "" msgid "Encryption Key" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:320 -#: src/net/i2p/router/web/ConfigKeyringHandler.java:18 -msgid "Add key" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:322 -#: src/net/i2p/router/web/ConfigKeyringHandler.java:19 -msgid "Delete key" -msgstr "" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:107 msgid "config logging" msgstr "" @@ -885,21 +3641,6 @@ msgid "" "Banning will prevent the participation of this peer in tunnels you create." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:314 -#: src/net/i2p/router/web/ConfigPeerHandler.java:20 -msgid "Ban peer until restart" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:316 -#: src/net/i2p/router/web/ConfigPeerHandler.java:28 -msgid "Unban peer" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:322 -#: src/net/i2p/router/web/ConfigPeerHandler.java:39 -msgid "Adjust Profile Bonuses" -msgstr "" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:324 msgid "" "Bonuses may be positive or negative, and affect the peer's inclusion in Fast " @@ -912,24 +3653,12 @@ msgstr "" msgid "profiles page" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:334 -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:71 -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:231 -msgid "Speed" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:338 -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:72 -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:232 -msgid "Capacity" -msgstr "" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:342 msgid "Adjust peer bonuses" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:344 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:249 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:253 msgid "Banned Peers" msgstr "" @@ -960,22 +3689,6 @@ msgid "" "If you need to kill the router immediately, that option is available as well." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:290 -#: src/net/i2p/router/web/ConfigServiceHandler.java:53 -msgid "Shutdown gracefully" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:292 -#: src/net/i2p/router/web/ConfigRestartBean.java:32 -#: src/net/i2p/router/web/ConfigServiceHandler.java:57 -msgid "Shutdown immediately" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:294 -#: src/net/i2p/router/web/ConfigServiceHandler.java:61 -msgid "Cancel graceful shutdown" -msgstr "" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:298 msgid "" "If you want the router to restart itself after shutting down, you can choose " @@ -1005,16 +3718,6 @@ msgid "" "again." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:308 -#: src/net/i2p/router/web/ConfigServiceHandler.java:64 -msgid "Graceful restart" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:310 -#: src/net/i2p/router/web/ConfigServiceHandler.java:68 -msgid "Hard restart" -msgstr "" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:316 msgid "Systray integration" msgstr "" @@ -1035,16 +3738,6 @@ msgstr "" msgid "If you are on windows, you can either enable or disable that icon here." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:324 -#: src/net/i2p/router/web/ConfigServiceHandler.java:91 -msgid "Show systray icon" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:326 -#: src/net/i2p/router/web/ConfigServiceHandler.java:103 -msgid "Hide systray icon" -msgstr "" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:328 msgid "Run on startup" msgstr "" @@ -1063,16 +3756,6 @@ msgstr "" msgid "If you prefer the command line, you can also run the " msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:338 -#: src/net/i2p/router/web/ConfigServiceHandler.java:80 -msgid "Run I2P on startup" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:340 -#: src/net/i2p/router/web/ConfigServiceHandler.java:82 -msgid "Don't run I2P on startup" -msgstr "" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:344 msgid "" "If you are running I2P as service right now, removing it will shut down your " @@ -1089,11 +3772,6 @@ msgstr "" msgid "Debugging" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:356 -#: src/net/i2p/router/web/ConfigServiceHandler.java:84 -msgid "Dump threads" -msgstr "" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:360 msgid "Launch browser on router startup?" msgstr "" @@ -1104,16 +3782,6 @@ msgid "" "convenience I2P can launch a web browser on startup pointing at" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:364 -#: src/net/i2p/router/web/ConfigServiceHandler.java:115 -msgid "View console on startup" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:366 -#: src/net/i2p/router/web/ConfigServiceHandler.java:118 -msgid "Do not view console on startup" -msgstr "" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:107 msgid "config stats" msgstr "" @@ -1260,11 +3928,6 @@ msgstr "" msgid "Update In Progress" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:310 -#: src/net/i2p/router/web/ConfigUpdateHandler.java:56 -msgid "Check for updates" -msgstr "" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:314 msgid "News URL" msgstr "" @@ -1339,13 +4002,6 @@ msgstr "" msgid "home" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/index_jsp.java:234 -#: src/net/i2p/router/web/CSSHelper.java:41 -#: src/net/i2p/router/web/SummaryBarRenderer.java:26 -#: src/net/i2p/router/web/SummaryBarRenderer.java:28 -msgid "I2P Router Console" -msgstr "" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:105 msgid "job queue" msgstr "" @@ -1378,14 +4034,6 @@ msgstr "" msgid "I2P Network Database Summary" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldstats_jsp.java:105 -msgid "statistics" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldstats_jsp.java:242 -msgid "I2P Router Statistics" -msgstr "" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:105 msgid "peer connections" msgstr "" @@ -1402,6 +4050,14 @@ msgstr "" msgid "I2P Network Peer Profiles" msgstr "" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:105 +msgid "statistics" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:242 +msgid "I2P Router Statistics" +msgstr "" + #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:245 #, java-format msgid "Disable {0}s Refresh" @@ -1414,1439 +4070,3 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:227 msgid "I2P Tunnel Summary" msgstr "" - -#: src/net/i2p/router/web/ConfigAdvancedHandler.java:57 -msgid "Error updating the configuration - please see the error logs" -msgstr "" - -#: src/net/i2p/router/web/ConfigAdvancedHandler.java:69 -#: src/net/i2p/router/web/ConfigNetHandler.java:251 -msgid "Configuration saved successfully" -msgstr "" - -#: src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: src/net/i2p/router/web/ConfigNetHandler.java:253 -msgid "" -"Error saving the configuration (applied but not saved) - please see the " -"error logs" -msgstr "" - -#: src/net/i2p/router/web/ConfigClientsHandler.java:54 -#: src/net/i2p/router/web/ConfigClientsHelper.java:67 -msgid "Start" -msgstr "" - -#: src/net/i2p/router/web/ConfigClientsHandler.java:68 -#: src/net/i2p/router/web/ConfigKeyringHandler.java:49 -msgid "Unsupported" -msgstr "" - -#: src/net/i2p/router/web/ConfigClientsHandler.java:83 -msgid "" -"Client configuration saved successfully - restart required to take effect." -msgstr "" - -#: src/net/i2p/router/web/ConfigClientsHandler.java:89 -msgid "Bad client index." -msgstr "" - -#: src/net/i2p/router/web/ConfigClientsHandler.java:94 -#: src/net/i2p/router/web/ConfigClientsHelper.java:17 -#: src/net/i2p/router/web/SummaryBarRenderer.java:359 -#: src/net/i2p/router/web/SummaryHelper.java:371 -msgid "Client" -msgstr "" - -#: src/net/i2p/router/web/ConfigClientsHandler.java:94 -#: src/net/i2p/router/web/ConfigClientsHandler.java:129 -msgid "started" -msgstr "" - -#: src/net/i2p/router/web/ConfigClientsHandler.java:111 -msgid "" -"WebApp configuration saved successfully - restart required to take effect." -msgstr "" - -#: src/net/i2p/router/web/ConfigClientsHandler.java:129 -#: src/net/i2p/router/web/ConfigClientsHelper.java:34 -msgid "WebApp" -msgstr "" - -#: src/net/i2p/router/web/ConfigClientsHandler.java:131 -msgid "Failed to start" -msgstr "" - -#: src/net/i2p/router/web/ConfigClientsHandler.java:137 -msgid "Failed to find server." -msgstr "" - -#: src/net/i2p/router/web/ConfigClientsHelper.java:17 -msgid "Class and arguments" -msgstr "" - -#: src/net/i2p/router/web/ConfigClientsHelper.java:17 -#: src/net/i2p/router/web/ConfigClientsHelper.java:34 -msgid "Run at Startup?" -msgstr "" - -#: src/net/i2p/router/web/ConfigClientsHelper.java:17 -#: src/net/i2p/router/web/ConfigClientsHelper.java:34 -msgid "Start Now" -msgstr "" - -#: src/net/i2p/router/web/ConfigClientsHelper.java:34 -msgid "Description" -msgstr "" - -#: src/net/i2p/router/web/ConfigKeyringHandler.java:21 -msgid "You must enter a destination" -msgstr "" - -#: src/net/i2p/router/web/ConfigKeyringHandler.java:23 -msgid "You must enter a key" -msgstr "" - -#: src/net/i2p/router/web/ConfigKeyringHandler.java:34 -#: src/net/i2p/router/web/ConfigKeyringHandler.java:41 -#: src/net/i2p/router/web/ConfigKeyringHandler.java:43 -msgid "Key for" -msgstr "" - -#: src/net/i2p/router/web/ConfigKeyringHandler.java:34 -msgid "added to keyring" -msgstr "" - -#: src/net/i2p/router/web/ConfigKeyringHandler.java:36 -msgid "Invalid destination or key" -msgstr "" - -#: src/net/i2p/router/web/ConfigKeyringHandler.java:41 -msgid "removed from keyring" -msgstr "" - -#: src/net/i2p/router/web/ConfigKeyringHandler.java:43 -msgid "not found in keyring" -msgstr "" - -#: src/net/i2p/router/web/ConfigKeyringHandler.java:45 -msgid "Invalid destination" -msgstr "" - -#: src/net/i2p/router/web/ConfigLoggingHelper.java:52 -msgid "CRIT" -msgstr "" - -#: src/net/i2p/router/web/ConfigLoggingHelper.java:52 -msgid "DEBUG" -msgstr "" - -#: src/net/i2p/router/web/ConfigLoggingHelper.java:52 -msgid "ERROR" -msgstr "" - -#: src/net/i2p/router/web/ConfigLoggingHelper.java:52 -msgid "INFO" -msgstr "" - -#: src/net/i2p/router/web/ConfigLoggingHelper.java:52 -msgid "WARN" -msgstr "" - -#: src/net/i2p/router/web/ConfigNavHelper.java:18 -msgid "Network" -msgstr "" - -#: src/net/i2p/router/web/ConfigNavHelper.java:18 -msgid "Service" -msgstr "" - -#: src/net/i2p/router/web/ConfigNavHelper.java:18 -#: src/net/i2p/router/web/SummaryBarRenderer.java:82 -#: src/net/i2p/router/web/TunnelRenderer.java:253 -msgid "Tunnels" -msgstr "" - -#: src/net/i2p/router/web/ConfigNavHelper.java:18 -msgid "UI" -msgstr "" - -#: src/net/i2p/router/web/ConfigNavHelper.java:18 -#: src/net/i2p/router/web/SummaryBarRenderer.java:198 -#: src/net/i2p/router/web/SummaryBarRenderer.java:205 -msgid "Update" -msgstr "" - -#: src/net/i2p/router/web/ConfigNavHelper.java:19 -msgid "Clients" -msgstr "" - -#: src/net/i2p/router/web/ConfigNavHelper.java:19 -msgid "Logging" -msgstr "" - -#: src/net/i2p/router/web/ConfigNavHelper.java:19 -#: src/net/i2p/router/web/SummaryBarRenderer.java:88 -#: src/net/i2p/router/web/SummaryBarRenderer.java:223 -msgid "Peers" -msgstr "" - -#: src/net/i2p/router/web/ConfigNavHelper.java:19 -#: src/net/i2p/router/web/NetDbRenderer.java:256 -#: src/net/i2p/router/web/SummaryBarRenderer.java:124 -msgid "Stats" -msgstr "" - -#: src/net/i2p/router/web/ConfigNavHelper.java:20 -msgid "Advanced" -msgstr "" - -#: src/net/i2p/router/web/ConfigNetHandler.java:119 -msgid "Rechecking router reachability..." -msgstr "" - -#: src/net/i2p/router/web/ConfigNetHandler.java:148 -msgid "Updating IP address" -msgstr "" - -#: src/net/i2p/router/web/ConfigNetHandler.java:166 -msgid "Disabling TCP completely" -msgstr "" - -#: src/net/i2p/router/web/ConfigNetHandler.java:170 -msgid "Updating inbound TCP address to" -msgstr "" - -#: src/net/i2p/router/web/ConfigNetHandler.java:174 -msgid "Disabling inbound TCP" -msgstr "" - -#: src/net/i2p/router/web/ConfigNetHandler.java:176 -msgid "Updating inbound TCP address to auto" -msgstr "" - -#: src/net/i2p/router/web/ConfigNetHandler.java:185 -msgid "Updating inbound TCP port to" -msgstr "" - -#: src/net/i2p/router/web/ConfigNetHandler.java:188 -msgid "Updating inbound TCP port to auto" -msgstr "" - -#: src/net/i2p/router/web/ConfigNetHandler.java:200 -msgid "Updating UDP port from" -msgstr "" - -#: src/net/i2p/router/web/ConfigNetHandler.java:200 -msgid "to" -msgstr "" - -#: src/net/i2p/router/web/ConfigNetHandler.java:216 -msgid "Gracefully restarting into Hidden Router Mode" -msgstr "" - -#: src/net/i2p/router/web/ConfigNetHandler.java:218 -msgid "Gracefully restarting to exit Hidden Router Mode" -msgstr "" - -#: src/net/i2p/router/web/ConfigNetHandler.java:227 -msgid "Enabling UPnP, restart required to take effect" -msgstr "" - -#: src/net/i2p/router/web/ConfigNetHandler.java:229 -msgid "Disabling UPnP, restart required to take effect" -msgstr "" - -#: src/net/i2p/router/web/ConfigNetHandler.java:235 -msgid "Requiring SSU introduers" -msgstr "" - -#: src/net/i2p/router/web/ConfigNetHandler.java:275 -msgid "Gracefully restarting I2P to change published router address" -msgstr "" - -#: src/net/i2p/router/web/ConfigNetHandler.java:293 -msgid "Updating bandwidth share percentage" -msgstr "" - -#: src/net/i2p/router/web/ConfigNetHandler.java:363 -msgid "Updated bandwidth limits" -msgstr "" - -#: src/net/i2p/router/web/ConfigNetHelper.java:39 -#: src/net/i2p/router/web/ConfigNetHelper.java:47 -#: src/net/i2p/router/web/ConfigNetHelper.java:50 -#: src/net/i2p/router/web/ConfigNetHelper.java:57 -#: src/net/i2p/router/web/ConfigNetHelper.java:60 -msgid "unknown" -msgstr "" - -#: src/net/i2p/router/web/ConfigNetHelper.java:165 -msgid "bits per second" -msgstr "" - -#: src/net/i2p/router/web/ConfigPeerHandler.java:24 -#: src/net/i2p/router/web/ConfigPeerHandler.java:33 -#: src/net/i2p/router/web/ConfigPeerHandler.java:35 -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:69 -#: src/net/i2p/router/web/TunnelRenderer.java:235 -msgid "Peer" -msgstr "" - -#: src/net/i2p/router/web/ConfigPeerHandler.java:24 -msgid "banned until restart" -msgstr "" - -#: src/net/i2p/router/web/ConfigPeerHandler.java:27 -#: src/net/i2p/router/web/ConfigPeerHandler.java:38 -#: src/net/i2p/router/web/ConfigPeerHandler.java:59 -msgid "Invalid peer" -msgstr "" - -#: src/net/i2p/router/web/ConfigPeerHandler.java:33 -msgid "unbanned" -msgstr "" - -#: src/net/i2p/router/web/ConfigPeerHandler.java:35 -msgid "is not currently banned" -msgstr "" - -#: src/net/i2p/router/web/ConfigPeerHandler.java:47 -msgid "Bad speed value" -msgstr "" - -#: src/net/i2p/router/web/ConfigPeerHandler.java:52 -msgid "Bad capacity value" -msgstr "" - -#: src/net/i2p/router/web/ConfigRestartBean.java:36 -msgid "Cancel shutdown" -msgstr "" - -#: src/net/i2p/router/web/ConfigRestartBean.java:38 -msgid "Restart immediately" -msgstr "" - -#: src/net/i2p/router/web/ConfigRestartBean.java:42 -msgid "Restart" -msgstr "" - -#: src/net/i2p/router/web/ConfigRestartBean.java:45 -msgid "Shutdown" -msgstr "" - -#: src/net/i2p/router/web/ConfigRestartBean.java:56 -msgid "Shutdown imminent" -msgstr "" - -#: src/net/i2p/router/web/ConfigRestartBean.java:59 -#, java-format -msgid "Shutdown in {0}" -msgstr "" - -#: src/net/i2p/router/web/ConfigRestartBean.java:64 -#, java-format -msgid "Restart in {0}" -msgstr "" - -#: src/net/i2p/router/web/ConfigServiceHandler.java:56 -msgid "Graceful shutdown initiated" -msgstr "" - -#: src/net/i2p/router/web/ConfigServiceHandler.java:60 -msgid "Shutdown immediately! boom bye bye bad bwoy" -msgstr "" - -#: src/net/i2p/router/web/ConfigServiceHandler.java:63 -msgid "Graceful shutdown cancelled" -msgstr "" - -#: src/net/i2p/router/web/ConfigServiceHandler.java:67 -msgid "Graceful restart requested" -msgstr "" - -#: src/net/i2p/router/web/ConfigServiceHandler.java:71 -msgid "Hard restart requested" -msgstr "" - -#: src/net/i2p/router/web/ConfigServiceHandler.java:72 -msgid "Rekey and Restart" -msgstr "" - -#: src/net/i2p/router/web/ConfigServiceHandler.java:73 -msgid "Rekeying after graceful restart" -msgstr "" - -#: src/net/i2p/router/web/ConfigServiceHandler.java:76 -msgid "Rekey and Shutdown" -msgstr "" - -#: src/net/i2p/router/web/ConfigServiceHandler.java:77 -msgid "Rekeying after graceful shutdown" -msgstr "" - -#: src/net/i2p/router/web/ConfigServiceHandler.java:96 -msgid "System tray icon enabled." -msgstr "" - -#: src/net/i2p/router/web/ConfigServiceHandler.java:98 -#: src/net/i2p/router/web/ConfigServiceHandler.java:110 -msgid "System tray icon feature not supported on this platform. Sorry!" -msgstr "" - -#: src/net/i2p/router/web/ConfigServiceHandler.java:101 -#: src/net/i2p/router/web/ConfigServiceHandler.java:113 -msgid "Warning: unable to contact the systray manager" -msgstr "" - -#: src/net/i2p/router/web/ConfigServiceHandler.java:108 -msgid "System tray icon disabled." -msgstr "" - -#: src/net/i2p/router/web/ConfigServiceHandler.java:117 -msgid "Console is to be shown on startup" -msgstr "" - -#: src/net/i2p/router/web/ConfigServiceHandler.java:120 -msgid "Console is not to be shown on startup" -msgstr "" - -#: src/net/i2p/router/web/ConfigServiceHandler.java:129 -msgid "Service installed" -msgstr "" - -#: src/net/i2p/router/web/ConfigServiceHandler.java:131 -msgid "Warning: unable to install the service" -msgstr "" - -#: src/net/i2p/router/web/ConfigServiceHandler.java:137 -msgid "Service removed" -msgstr "" - -#: src/net/i2p/router/web/ConfigServiceHandler.java:139 -msgid "Warning: unable to remove the service" -msgstr "" - -#: src/net/i2p/router/web/ConfigStatsHandler.java:118 -msgid "Stat filter and location updated successfully to" -msgstr "" - -#: src/net/i2p/router/web/ConfigStatsHandler.java:120 -msgid "Failed to update the stat filter and location" -msgstr "" - -#: src/net/i2p/router/web/ConfigTunnelsHandler.java:137 -msgid "Updated settings for all pools." -msgstr "" - -#: src/net/i2p/router/web/ConfigTunnelsHandler.java:142 -msgid "Exploratory tunnel configuration saved successfully." -msgstr "" - -#: src/net/i2p/router/web/ConfigTunnelsHandler.java:144 -#: src/net/i2p/router/web/ConfigUIHandler.java:36 -msgid "" -"Error saving the configuration (applied but not saved) - please see the " -"error logs." -msgstr "" - -#: src/net/i2p/router/web/ConfigTunnelsHelper.java:11 -msgid "hop" -msgstr "" - -#: src/net/i2p/router/web/ConfigTunnelsHelper.java:12 -msgid "tunnel" -msgstr "" - -#: src/net/i2p/router/web/ConfigTunnelsHelper.java:14 -msgid "hops" -msgstr "" - -#: src/net/i2p/router/web/ConfigTunnelsHelper.java:15 -msgid "tunnels" -msgstr "" - -#: src/net/i2p/router/web/ConfigTunnelsHelper.java:26 -#: src/net/i2p/router/web/TunnelRenderer.java:40 -msgid "Exploratory tunnels" -msgstr "" - -#: src/net/i2p/router/web/ConfigTunnelsHelper.java:46 -#: src/net/i2p/router/web/TunnelRenderer.java:60 -msgid "Client tunnels for" -msgstr "" - -#: src/net/i2p/router/web/ConfigTunnelsHelper.java:69 -msgid "ANONYMITY WARNING - Settings include 0-hop tunnels." -msgstr "" - -#: src/net/i2p/router/web/ConfigTunnelsHelper.java:74 -msgid "ANONYMITY WARNING - Settings include 1-hop tunnels." -msgstr "" - -#: src/net/i2p/router/web/ConfigTunnelsHelper.java:77 -msgid "PERFORMANCE WARNING - Settings include very long tunnels." -msgstr "" - -#: src/net/i2p/router/web/ConfigTunnelsHelper.java:80 -msgid "PERFORMANCE WARNING - Settings include high tunnel quantities." -msgstr "" - -#: src/net/i2p/router/web/ConfigTunnelsHelper.java:82 -msgid "Inbound" -msgstr "" - -#: src/net/i2p/router/web/ConfigTunnelsHelper.java:82 -msgid "Outbound" -msgstr "" - -#: src/net/i2p/router/web/ConfigTunnelsHelper.java:87 -msgid "Depth" -msgstr "" - -#: src/net/i2p/router/web/ConfigTunnelsHelper.java:104 -msgid "Randomization" -msgstr "" - -#: src/net/i2p/router/web/ConfigTunnelsHelper.java:128 -msgid "Quantity" -msgstr "" - -#: src/net/i2p/router/web/ConfigTunnelsHelper.java:145 -msgid "Backup quantity" -msgstr "" - -#: src/net/i2p/router/web/ConfigTunnelsHelper.java:167 -msgid "Inbound options" -msgstr "" - -#: src/net/i2p/router/web/ConfigTunnelsHelper.java:180 -msgid "Outbound options" -msgstr "" - -#: src/net/i2p/router/web/ConfigUIHandler.java:31 -msgid "Theme change saved." -msgstr "" - -#: src/net/i2p/router/web/ConfigUIHandler.java:33 -msgid "Refresh the page to view." -msgstr "" - -#: src/net/i2p/router/web/ConfigUIHelper.java:40 -msgid "English" -msgstr "" - -#: src/net/i2p/router/web/ConfigUIHelper.java:40 -msgid "French" -msgstr "" - -#: src/net/i2p/router/web/ConfigUIHelper.java:40 -msgid "German" -msgstr "" - -#: src/net/i2p/router/web/ConfigUIHelper.java:41 -msgid "Chinese" -msgstr "" - -#: src/net/i2p/router/web/ConfigUIHelper.java:41 -msgid "Dutch" -msgstr "" - -#: src/net/i2p/router/web/ConfigUIHelper.java:41 -msgid "Swedish" -msgstr "" - -#: src/net/i2p/router/web/ConfigUpdateHandler.java:63 -msgid "Update available, attempting to download now" -msgstr "" - -#: src/net/i2p/router/web/ConfigUpdateHandler.java:65 -msgid "Update available, click button on left to download" -msgstr "" - -#: src/net/i2p/router/web/ConfigUpdateHandler.java:67 -msgid "No update available" -msgstr "" - -#: src/net/i2p/router/web/ConfigUpdateHandler.java:75 -msgid "Updating news URL to" -msgstr "" - -#: src/net/i2p/router/web/ConfigUpdateHandler.java:83 -msgid "Updating proxy host to" -msgstr "" - -#: src/net/i2p/router/web/ConfigUpdateHandler.java:91 -msgid "Updating proxy port to" -msgstr "" - -#: src/net/i2p/router/web/ConfigUpdateHandler.java:104 -msgid "Updating refresh frequency to" -msgstr "" - -#: src/net/i2p/router/web/ConfigUpdateHandler.java:111 -msgid "Updating update policy to" -msgstr "" - -#: src/net/i2p/router/web/ConfigUpdateHandler.java:120 -msgid "Updating update URLs." -msgstr "" - -#: src/net/i2p/router/web/ConfigUpdateHandler.java:128 -msgid "Updating trusted keys." -msgstr "" - -#: src/net/i2p/router/web/ConfigUpdateHandler.java:136 -msgid "Updating unsigned update URL to" -msgstr "" - -#: src/net/i2p/router/web/ConfigUpdateHelper.java:75 -#: src/net/i2p/router/web/GraphHelper.java:115 -msgid "Never" -msgstr "" - -#: src/net/i2p/router/web/ConfigUpdateHelper.java:77 -msgid "Every" -msgstr "" - -#: src/net/i2p/router/web/ConfigUpdateHelper.java:90 -#: src/net/i2p/router/web/ConfigUpdateHelper.java:92 -msgid "Notify only" -msgstr "" - -#: src/net/i2p/router/web/ConfigUpdateHelper.java:95 -#: src/net/i2p/router/web/ConfigUpdateHelper.java:97 -msgid "Download and verify only" -msgstr "" - -#: src/net/i2p/router/web/ConfigUpdateHelper.java:101 -#: src/net/i2p/router/web/ConfigUpdateHelper.java:103 -msgid "Download, verify, and restart" -msgstr "" - -#: src/net/i2p/router/web/GraphHelper.java:107 -msgid "Configure Graph Display" -msgstr "" - -#: src/net/i2p/router/web/GraphHelper.java:107 -msgid "Select Stats" -msgstr "" - -#: src/net/i2p/router/web/GraphHelper.java:109 -msgid "Periods" -msgstr "" - -#: src/net/i2p/router/web/GraphHelper.java:110 -msgid "Plot averages" -msgstr "" - -#: src/net/i2p/router/web/GraphHelper.java:111 -msgid "plot events" -msgstr "" - -#: src/net/i2p/router/web/GraphHelper.java:112 -msgid "Image sizes" -msgstr "" - -#: src/net/i2p/router/web/GraphHelper.java:112 -msgid "width" -msgstr "" - -#: src/net/i2p/router/web/GraphHelper.java:113 -msgid "height" -msgstr "" - -#: src/net/i2p/router/web/GraphHelper.java:113 -#: src/net/i2p/router/web/GraphHelper.java:114 -msgid "pixels" -msgstr "" - -#: src/net/i2p/router/web/GraphHelper.java:115 -msgid "Refresh delay" -msgstr "" - -#: src/net/i2p/router/web/GraphHelper.java:115 -msgid "hour" -msgstr "" - -#: src/net/i2p/router/web/GraphHelper.java:115 -msgid "minute" -msgstr "" - -#: src/net/i2p/router/web/GraphHelper.java:115 -msgid "minutes" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:59 -msgid "Network Database RouterInfo Lookup" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:74 -msgid "Router" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:74 -msgid "not found in network database" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:86 -#: src/net/i2p/router/web/NetDbRenderer.java:135 -msgid "Network Database Contents" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:87 -#: src/net/i2p/router/web/NetDbRenderer.java:135 -msgid "View" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:96 -msgid "LeaseSet" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:98 -msgid "Local" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:100 -msgid "Unpublished" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:101 -#: src/net/i2p/router/web/NetDbRenderer.java:108 -msgid "Destination" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:118 -#, java-format -msgid "Expires in {0}" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:120 -#, java-format -msgid "Expired {0} ago" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:122 -#: src/net/i2p/router/web/TunnelRenderer.java:156 -msgid "Gateway" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:122 -msgid "Lease" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:124 -msgid "Tunnel" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:137 -msgid "Not initialized" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:143 -msgid "Routers" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:145 -msgid "view without" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:147 -msgid "view with" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:148 -msgid "stats" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:183 -#: src/net/i2p/router/web/NetDbRenderer.java:199 -msgid "Count" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:183 -#: src/net/i2p/router/web/SummaryBarRenderer.java:150 -msgid "Version" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:199 -msgid "Country" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:222 -msgid "Our info" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:224 -msgid "Peer info for" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:228 -msgid "Full entry" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:234 -msgid "Updated" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:234 -#: src/net/i2p/router/web/NetDbRenderer.java:236 -#: src/net/i2p/router/web/SummaryHelper.java:385 -msgid "ago" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:236 -#: src/net/i2p/router/web/NetDbRenderer.java:238 -msgid "Published" -msgstr "" - -#: src/net/i2p/router/web/NetDbRenderer.java:239 -msgid "Address(es)" -msgstr "" - -#: src/net/i2p/router/web/NewsFetcher.java:80 -#, java-format -msgid "News last updated {0} ago." -msgstr "" - -#: src/net/i2p/router/web/NewsFetcher.java:86 -#, java-format -msgid "News last checked {0} ago." -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:63 -msgid "Peer Profiles" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:64 -#, java-format -msgid "Showing {0} recent profiles." -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:65 -#, java-format -msgid "Hiding {0} older profiles." -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:70 -msgid "Groups (Caps)" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:73 -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:233 -msgid "Integration" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:74 -msgid "Status" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:111 -msgid "Fast, High Capacity" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:112 -msgid "High Capacity" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:113 -msgid "Standard" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:114 -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:148 -msgid "Failing" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:116 -#: src/net/i2p/router/web/SummaryBarRenderer.java:249 -msgid "Integrated" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:147 -msgid "Banned" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:149 -msgid "Unreachable" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:156 -msgid "Test Fails" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:168 -msgid "Floodfill and Integrated Peers" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:230 -msgid "Thresholds:" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:234 -msgid "Definitions" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:235 -msgid "as determined by the profile organizer" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:235 -msgid "groups" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:236 -msgid "capabilities in the netDb, not used to determine profiles" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:236 -msgid "caps" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:237 -msgid "" -"peak throughput (bytes per second) over a 1 minute period that the peer has " -"sustained in a single tunnel" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:237 -msgid "speed" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:238 -msgid "capacity" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:238 -msgid "how many tunnels can we ask them to join in an hour?" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:239 -msgid "how many new peers have they told us about lately?" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:239 -msgid "integration" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:240 -msgid "is the peer banned, or unreachable, or failing tunnel tests?" -msgstr "" - -#: src/net/i2p/router/web/ProfileOrganizerRenderer.java:240 -msgid "status" -msgstr "" - -#: src/net/i2p/router/web/StatsGenerator.java:58 -msgid "Statistics gathered during this router's uptime" -msgstr "" - -#: src/net/i2p/router/web/StatsGenerator.java:61 -msgid "" -"The data gathered is quantized over a 1 minute period, so should just be " -"used as an estimate." -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:40 -msgid "" -"Configure startup of clients and webapps (services); manually start dormant " -"services" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:42 -msgid "I2P Services" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:48 -msgid "Manage your I2P hosts file here (I2P domain name resolution)" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:50 -msgid "Addressbook" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:54 -msgid "Built-in anonymous BitTorrent Client" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:56 -msgid "Torrents" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:60 -msgid "Anonymous webmail client" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:62 -msgid "Webmail" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:66 -msgid "Anonymous resident webserver" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:68 -msgid "Webserver" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:72 -msgid "Configure I2P Router" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:74 -msgid "I2P Internals" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:80 -#: src/net/i2p/router/web/SummaryBarRenderer.java:344 -msgid "View existing tunnels and tunnel build status" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:86 -#: src/net/i2p/router/web/SummaryBarRenderer.java:221 -msgid "Show all current peer connections" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:92 -msgid "Show recent peer performance profiles" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:94 -msgid "Profiles" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:98 -msgid "Show list of all known I2P routers" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:100 -msgid "NetDB" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:104 -msgid "Health Report" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:106 -msgid "Logs" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:110 -msgid "Show the router's workload, and how it's performing" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:112 -msgid "Jobs" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:116 -msgid "Graph router performance" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:118 -msgid "Graphs" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:122 -msgid "Textual router performance statistics" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:134 -msgid "I2P Router Help" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:136 -msgid "General" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:139 -msgid "Your unique I2P router identity is" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:143 -msgid "never reveal it to anyone" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:145 -msgid "Local Identity" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:157 -msgid "How long we've been running for this session" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:160 -msgid "Uptime" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:167 -msgid "" -"Help with configuring your firewall and router for optimal I2P performance" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:194 -msgid "Download" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:203 -msgid "Download Unsigned" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:229 -msgid "Active" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:237 -msgid "Fast" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:243 -msgid "High capacity" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:255 -msgid "Known" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:270 -msgid "Help with firewall configuration" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:272 -msgid "Check NAT/firewall" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:292 -msgid "Reseed" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:309 -msgid "Configure router bandwidth allocation" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:311 -msgid "Bandwidth in/out" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:328 -msgid "Total" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:336 -msgid "Used" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:346 -msgid "Tunnels in/out" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:351 -msgid "Exploratory" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:367 -msgid "Participating" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:373 -msgid "What's in the router's job queue?" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:375 -msgid "Congestion" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:380 -msgid "Job lag" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:386 -msgid "Message delay" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:392 -msgid "Tunnel lag" -msgstr "" - -#: src/net/i2p/router/web/SummaryBarRenderer.java:398 -msgid "Backlog" -msgstr "" - -#: src/net/i2p/router/web/SummaryHelper.java:73 -msgid "skew" -msgstr "" - -#: src/net/i2p/router/web/SummaryHelper.java:92 -msgid "ERR-Client Manager I2CP Error - check logs" -msgstr "" - -#: src/net/i2p/router/web/SummaryHelper.java:94 -msgid "ERR-ClockSkew" -msgstr "" - -#: src/net/i2p/router/web/SummaryHelper.java:104 -msgid "ERR-Private TCP Address" -msgstr "" - -#: src/net/i2p/router/web/SummaryHelper.java:106 -msgid "ERR-SymmetricNAT" -msgstr "" - -#: src/net/i2p/router/web/SummaryHelper.java:109 -msgid "WARN-Firewalled with Inbound TCP Enabled" -msgstr "" - -#: src/net/i2p/router/web/SummaryHelper.java:111 -msgid "WARN-Firewalled and Floodfill" -msgstr "" - -#: src/net/i2p/router/web/SummaryHelper.java:113 -msgid "WARN-Firewalled and Fast" -msgstr "" - -#: src/net/i2p/router/web/SummaryHelper.java:116 -msgid "" -"ERR-UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and " -"restart" -msgstr "" - -#: src/net/i2p/router/web/SummaryHelper.java:123 -msgid "ERR-UDP Disabled and Inbound TCP host/port not set" -msgstr "" - -#: src/net/i2p/router/web/SummaryHelper.java:125 -msgid "WARN-Firewalled with UDP Disabled" -msgstr "" - -#: src/net/i2p/router/web/SummaryHelper.java:360 -msgid "Add/remove/edit & control your client and server tunnels" -msgstr "" - -#: src/net/i2p/router/web/SummaryHelper.java:360 -msgid "Local Destinations" -msgstr "" - -#: src/net/i2p/router/web/SummaryHelper.java:369 -msgid "Server" -msgstr "" - -#: src/net/i2p/router/web/SummaryHelper.java:373 -msgid "Show tunnels" -msgstr "" - -#: src/net/i2p/router/web/SummaryHelper.java:384 -msgid "Leases expired" -msgstr "" - -#: src/net/i2p/router/web/SummaryHelper.java:384 -#: src/net/i2p/router/web/SummaryHelper.java:385 -msgid "Rebuilding" -msgstr "" - -#: src/net/i2p/router/web/SummaryHelper.java:388 -msgid "Ready" -msgstr "" - -#: src/net/i2p/router/web/SummaryHelper.java:392 -msgid "Building" -msgstr "" - -#: src/net/i2p/router/web/SummaryHelper.java:392 -msgid "Building tunnels" -msgstr "" - -#: src/net/i2p/router/web/SummaryHelper.java:404 strings/Strings.java:33 -msgid "shared clients" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:40 -#: src/net/i2p/router/web/TunnelRenderer.java:62 -msgid "config" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:70 -msgid "Participating tunnels" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:71 -msgid "From" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:71 -msgid "Receive on" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:72 -msgid "Expiration" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:72 -msgid "Send on" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:72 -msgid "To" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:73 -msgid "Rate" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:73 -msgid "Role" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:73 -#: src/net/i2p/router/web/TunnelRenderer.java:156 -msgid "Usage" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:117 -msgid "Outbound Endpoint" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:119 -msgid "Inbound Gateway" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:121 -#: src/net/i2p/router/web/TunnelRenderer.java:162 -msgid "Participant" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:126 -msgid "Inactive participating tunnels" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:127 -#: src/net/i2p/router/web/TunnelRenderer.java:216 -msgid "Lifetime bandwidth usage" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:156 -msgid "Expiry" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:156 -msgid "In/Out" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:159 -msgid "Participants" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:165 -msgid "Endpoint" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:205 -#: src/net/i2p/router/web/TunnelRenderer.java:211 -msgid "Build in progress" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:205 -msgid "inbound" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:211 -msgid "outbound" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:215 -msgid "No tunnels; waiting for the grace period to end." -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:216 -msgid "in" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:217 -msgid "out" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:234 -msgid "Tunnel Counts By Peer" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:235 -msgid "% of total" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:235 -msgid "Expl. + Client" -msgstr "" - -#: src/net/i2p/router/web/TunnelRenderer.java:235 -msgid "Part. from + to" -msgstr "" - -#: strings/Strings.java:12 -msgid "addressbook" -msgstr "" - -#: strings/Strings.java:13 -msgid "i2psnark" -msgstr "" - -#: strings/Strings.java:14 -msgid "i2ptunnel" -msgstr "" - -#: strings/Strings.java:15 -msgid "susimail" -msgstr "" - -#: strings/Strings.java:16 -msgid "susidns" -msgstr "" - -#: strings/Strings.java:17 -msgid "routerconsole" -msgstr "" - -#: strings/Strings.java:22 -msgid "Web console" -msgstr "" - -#: strings/Strings.java:23 -msgid "SAM application bridge" -msgstr "" - -#: strings/Strings.java:24 -msgid "Application tunnels" -msgstr "" - -#: strings/Strings.java:25 -msgid "My eepsite web server" -msgstr "" - -#: strings/Strings.java:26 -msgid "Browser launch at startup" -msgstr "" - -#: strings/Strings.java:27 -msgid "BOB application bridge" -msgstr "" - -#: strings/Strings.java:34 -msgid "IRC proxy" -msgstr "" - -#: strings/Strings.java:35 -msgid "eepsite" -msgstr "" - -#: strings/Strings.java:37 -msgid "I2PSnark" -msgstr "" - -#: strings/Strings.java:40 -msgid "classic" -msgstr "" - -#: strings/Strings.java:41 -msgid "dark" -msgstr "" - -#: strings/Strings.java:42 -msgid "light" -msgstr "" From 18a0f01f8b1420a4ecd855827cbf8e2ed34a7473 Mon Sep 17 00:00:00 2001 From: echelon Date: Sat, 5 Dec 2009 22:15:05 +0000 Subject: [PATCH 035/127] corrected typo --- .../java/src/net/i2p/router/web/ConfigNetHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java index 35045d485..373a272f0 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java @@ -232,7 +232,7 @@ public class ConfigNetHandler extends FormHandler { if (_requireIntroductions) { _context.router().setConfigSetting(UDPTransport.PROP_FORCE_INTRODUCERS, "true"); - addFormNotice(_("Requiring SSU introduers")); + addFormNotice(_("Requiring SSU introducers")); } else { _context.router().removeConfigSetting(UDPTransport.PROP_FORCE_INTRODUCERS); } From 4b7aeb84183aca40cac3a8d14eb2a81a00df711a Mon Sep 17 00:00:00 2001 From: echelon Date: Sat, 5 Dec 2009 23:21:29 +0000 Subject: [PATCH 036/127] update to german translation, need more work --- apps/routerconsole/locale/messages_de.po | 356 +++++++++++------------ 1 file changed, 178 insertions(+), 178 deletions(-) diff --git a/apps/routerconsole/locale/messages_de.po b/apps/routerconsole/locale/messages_de.po index 4621c68fc..9b0282c01 100644 --- a/apps/routerconsole/locale/messages_de.po +++ b/apps/routerconsole/locale/messages_de.po @@ -1320,7 +1320,7 @@ msgid "Disabling UPnP, restart required to take effect" msgstr "Deaktiviere UPnP, Neustart benötigt um wirksam zu werden" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:235 -msgid "Requiring SSU introduers" +msgid "Requiring SSU introducers" msgstr "Benötige SSU Hilfsrouter" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:275 @@ -1577,761 +1577,761 @@ msgstr "Warnung: Service konnte nicht entfernt werden" #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:118 msgid "Stat filter and location updated successfully to" -msgstr "" +msgstr "Statusfilter und Speicherort erfolgreich geändert auf" #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:120 msgid "Failed to update the stat filter and location" -msgstr "" +msgstr "Konnte Statusfilter und Speicherort nicht aktualisieren" #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:121 msgid "" "Graph list updated, may take up to 60s to be reflected here and on the Graphs Page" -msgstr "" +msgstr "Liste der Graphen aktualisiert, es braucht bis zu 60s um hier und auf Graphenseite angezeigt zu werden" #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:137 msgid "Updated settings for all pools." -msgstr "" +msgstr "Alle Einstellungen für alle Gruppen aktualisiert" #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:142 msgid "Exploratory tunnel configuration saved successfully." -msgstr "" +msgstr "Erkundungstunneleinstellungen erfolgreich gespeichert" #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:144 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:36 msgid "" "Error saving the configuration (applied but not saved) - please see the " "error logs." -msgstr "" +msgstr "Fehler beim Speichern der Einstellungen (angewendet aber nicht gespeichert) - schaue bitte in der Fehlerberichten nach" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:11 msgid "hop" -msgstr "" +msgstr "Zwischenstationen" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:12 msgid "tunnel" -msgstr "" +msgstr "Tunnel" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:14 msgid "hops" -msgstr "" +msgstr "Zwischenstationen" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:15 msgid "tunnels" -msgstr "" +msgstr "Tunnel" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:26 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:40 msgid "Exploratory tunnels" -msgstr "" +msgstr "Erkundungstunnel" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:46 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:60 msgid "Client tunnels for" -msgstr "" +msgstr "Kliententunnel für" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:69 msgid "ANONYMITY WARNING - Settings include 0-hop tunnels." -msgstr "" +msgstr "ANONYMITÄTSWARNUNG - Einstellung beinhaltet Tunnel ohne Zwischenstationen" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:74 msgid "ANONYMITY WARNING - Settings include 1-hop tunnels." -msgstr "" +msgstr "ANONYMITÄTSWARNUNG - Einstellung beinhaltet Tunnel mit nur 1 Zwischenstation" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:77 msgid "PERFORMANCE WARNING - Settings include very long tunnels." -msgstr "" +msgstr "PERFORMANCEWARNUNG - Einstellungen beinhaltet sehr lange Tunnel" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:80 msgid "PERFORMANCE WARNING - Settings include high tunnel quantities." -msgstr "" +msgstr "PERFORMANCEWARNUNG - Einstellungen beinhalten sehr viele Tunnel" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:82 msgid "Inbound" -msgstr "" +msgstr "Eingehend" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:82 msgid "Outbound" -msgstr "" +msgstr "Ausgehend" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:87 msgid "Depth" -msgstr "" +msgstr "Tiefe" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:104 msgid "Randomization" -msgstr "" +msgstr "Zufallskomponente" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:128 msgid "Quantity" -msgstr "" +msgstr "Anzahl" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:145 msgid "Backup quantity" -msgstr "" +msgstr "Anzahl der Ersatztunnel" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:167 msgid "Inbound options" -msgstr "" +msgstr "Optionen für Eingehendes" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:180 msgid "Outbound options" -msgstr "" +msgstr "Optionen für Ausgehendes" #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:31 msgid "Theme change saved." -msgstr "" +msgstr "Änderung an der Oberfläche gespeichert" #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:33 msgid "Refresh the page to view." -msgstr "" +msgstr "Um dieses zu sehen lade die Seite neu" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:41 msgid "English" -msgstr "" +msgstr "Englisch" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:41 msgid "French" -msgstr "" +msgstr "Französisch" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:41 msgid "German" -msgstr "" +msgstr "Deutsch" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:42 msgid "Chinese" -msgstr "" +msgstr "Chinesisch" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:42 msgid "Dutch" -msgstr "" +msgstr "Niederländisch" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:42 msgid "Russian" -msgstr "" +msgstr "Russisch" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:42 msgid "Swedish" -msgstr "" +msgstr "Schwedisch" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:56 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:310 msgid "Check for updates" -msgstr "" +msgstr "Auf Aktualisierungen prüfen" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:63 msgid "Update available, attempting to download now" -msgstr "" +msgstr "Aktualisierung verfügbar, versuche diese zu downloaden" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:65 msgid "Update available, click button on left to download" -msgstr "" +msgstr "Aktualisierung verfügbar, klicke auf den Knopf links zum download" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:67 msgid "No update available" -msgstr "" +msgstr "Keine Aktualisierung verfügbar" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:75 msgid "Updating news URL to" -msgstr "" +msgstr "Aktualisiere die Adresse für die Neuigkeiten auf" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:83 msgid "Updating proxy host to" -msgstr "" +msgstr "Aktualisiere den Proxyhost auf" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:91 msgid "Updating proxy port to" -msgstr "" +msgstr "Aktualisiere den Port des Proxy auf" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:104 msgid "Updating refresh frequency to" -msgstr "" +msgstr "Aktualisiere die Frequenz des Neuladens auf" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:111 msgid "Updating update policy to" -msgstr "" +msgstr "Aktualisiere die Aktualisierungsrichtlinien auf" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:120 msgid "Updating update URLs." -msgstr "" +msgstr "Aktualisiere die Aktualisierungsadressen auf" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:128 msgid "Updating trusted keys." -msgstr "" +msgstr "Aktualisiere die vertrauten Schlüssel" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:136 msgid "Updating unsigned update URL to" -msgstr "" +msgstr "Aktualisiere die Adresse der nicht vertrauten Aktualisierungsdatei auf" #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:75 #: ../java/src/net/i2p/router/web/GraphHelper.java:115 msgid "Never" -msgstr "" +msgstr "Nie" #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:77 msgid "Every" -msgstr "" +msgstr "Jedesmal" #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:90 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:92 msgid "Notify only" -msgstr "" +msgstr "Nur benachrichtigen" #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:95 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:97 msgid "Download and verify only" -msgstr "" +msgstr "Nur downloaden und überprüfen" #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:101 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:103 msgid "Download, verify, and restart" -msgstr "" +msgstr "Downloaden, überprüfen und neu starten" #: ../java/src/net/i2p/router/web/GraphHelper.java:107 msgid "Configure Graph Display" -msgstr "" +msgstr "Graphenanzeige einstellen" #: ../java/src/net/i2p/router/web/GraphHelper.java:107 msgid "Select Stats" -msgstr "" +msgstr "Wähle die Statistiken" #: ../java/src/net/i2p/router/web/GraphHelper.java:109 msgid "Periods" -msgstr "" +msgstr "Zeitraum" #: ../java/src/net/i2p/router/web/GraphHelper.java:110 msgid "Plot averages" -msgstr "" +msgstr "Zeichne die MIttelwerte" #: ../java/src/net/i2p/router/web/GraphHelper.java:111 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:405 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:336 msgid "or" -msgstr "" +msgstr "oder" #: ../java/src/net/i2p/router/web/GraphHelper.java:111 msgid "plot events" -msgstr "" +msgstr "zeichne Anzahl" #: ../java/src/net/i2p/router/web/GraphHelper.java:112 msgid "Image sizes" -msgstr "" +msgstr "Bildgrösse" #: ../java/src/net/i2p/router/web/GraphHelper.java:112 msgid "width" -msgstr "" +msgstr "Breite" #: ../java/src/net/i2p/router/web/GraphHelper.java:113 msgid "height" -msgstr "" +msgstr "Höhe" #: ../java/src/net/i2p/router/web/GraphHelper.java:113 #: ../java/src/net/i2p/router/web/GraphHelper.java:114 msgid "pixels" -msgstr "" +msgstr "Pixel" #: ../java/src/net/i2p/router/web/GraphHelper.java:115 msgid "Refresh delay" -msgstr "" +msgstr "Aktualisierungsintervall" #: ../java/src/net/i2p/router/web/GraphHelper.java:115 msgid "hour" -msgstr "" +msgstr "Stunde" #: ../java/src/net/i2p/router/web/GraphHelper.java:115 msgid "minute" -msgstr "" +msgstr "Minute" #: ../java/src/net/i2p/router/web/GraphHelper.java:115 msgid "minutes" -msgstr "" +msgstr "Minuten" #: ../java/src/net/i2p/router/web/GraphHelper.java:116 msgid "Redraw" -msgstr "" +msgstr "Zeichne neu" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:59 msgid "Network Database RouterInfo Lookup" -msgstr "" +msgstr "RouterInfo in der Netzwerkdatenbank anschauen" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:74 msgid "Router" -msgstr "" +msgstr "Router" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:74 msgid "not found in network database" -msgstr "" +msgstr "nicht in der Netzwerkdatenbank gefunden" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:82 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:134 msgid "Network Database Contents" -msgstr "" +msgstr "Netzwerkdatenbank Inhalt" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:83 msgid "View RouterInfo" -msgstr "" +msgstr "RouterInfo anschauen" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:84 msgid "LeaseSets" -msgstr "" +msgstr "LeaseSets" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:92 msgid "LeaseSet" -msgstr "" +msgstr "LeaseSet" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:94 msgid "Local" -msgstr "" +msgstr "Lokal" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 msgid "Unpublished" -msgstr "" +msgstr "Unveröffentlicht" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:97 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:104 msgid "Destination" -msgstr "" +msgstr "Destination" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:114 #, java-format msgid "Expires in {0}" -msgstr "" +msgstr "Wird in {0} ungültig" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:116 #, java-format msgid "Expired {0} ago" -msgstr "" +msgstr "Wurde vor {0} ungültig" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:118 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:156 msgid "Gateway" -msgstr "" +msgstr "Schnittstelle" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:118 msgid "Lease" -msgstr "" +msgstr "Lease" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:120 msgid "Tunnel" -msgstr "" +msgstr "Tunnel" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:134 msgid "View LeaseSets" -msgstr "" +msgstr "Zeige die LeaseSets" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:136 msgid "Not initialized" -msgstr "" +msgstr "Nicht initialisiert" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:145 msgid "Routers" -msgstr "" +msgstr "Router" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:147 msgid "Show all routers" -msgstr "" +msgstr "Zeige alle Router" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:149 msgid "Show all routers with full stats" -msgstr "" +msgstr "Zeige alle Router mit kompletten Statistiken" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:184 msgid "Network Database Router Statistics" -msgstr "" +msgstr "Statistiken der Netzwerkdatenbank Router" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:204 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:222 msgid "Count" -msgstr "" +msgstr "Anzahl" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 msgid "Version" -msgstr "" +msgstr "Version" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:204 msgid "Transports" -msgstr "" +msgstr "Transporte" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:222 msgid "Country" -msgstr "" +msgstr "Land" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:254 msgid "Our info" -msgstr "" +msgstr "Unsere Informationen" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:256 msgid "Peer info for" -msgstr "" +msgstr "Informationen über den Kontakt" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:260 msgid "Full entry" -msgstr "" +msgstr "Ganzer Eintrag" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:266 #: ../java/src/net/i2p/router/web/SummaryHelper.java:96 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:581 msgid "Hidden" -msgstr "" +msgstr "Versteckt" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:266 msgid "Updated" -msgstr "" +msgstr "Aktualisiert" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:267 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:270 #, java-format msgid "{0} ago" -msgstr "" +msgstr "vor {0}" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:269 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:273 msgid "Published" -msgstr "" +msgstr "Veröffentlicht" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:275 msgid "Address(es)" -msgstr "" +msgstr "Adresse(n)" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:308 msgid "Hidden or starting up" -msgstr "" +msgstr "Versteckt oder Startphase" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:308 msgid "SSU" -msgstr "" +msgstr "SSU" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:308 msgid "SSU with introducers" -msgstr "" +msgstr "SSU mit Hilsrouter" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:309 msgid "NTCP" -msgstr "" +msgstr "NTCP" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:309 msgid "NTCP and SSU" -msgstr "" +msgstr "NTCP und SSU" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:309 msgid "NTCP and SSU with introducers" -msgstr "" +msgstr "NTCP und SSU mit Hilfsrouter" #: ../java/src/net/i2p/router/web/NewsFetcher.java:80 #, java-format msgid "News last updated {0} ago." -msgstr "" +msgstr "Neueigkeiten wurden vor {0} aktualisiert" #: ../java/src/net/i2p/router/web/NewsFetcher.java:86 #, java-format msgid "News last checked {0} ago." -msgstr "" +msgstr "Vor {0} wurde auf neue Neueigkeiten geprüft" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:72 msgid "Peer Profiles" -msgstr "" +msgstr "Kontakt Profile" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:73 #, java-format msgid "Showing {0} recent profiles." -msgstr "" +msgstr "Zeige {0} aktuelle Profile" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:75 #, java-format msgid "Hiding {0} older profiles." -msgstr "" +msgstr "Zeige {0} alte Profile nicht an" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:77 #, java-format msgid "Hiding {0} standard profiles." -msgstr "" +msgstr "Zeige {0} Standardprofile nicht an" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:82 msgid "Groups (Caps)" -msgstr "" +msgstr "Gruppe (Werte)" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:83 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:251 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:334 msgid "Speed" -msgstr "" +msgstr "Geschwindigkeit" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:84 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:253 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:338 msgid "Capacity" -msgstr "" +msgstr "Kapazität" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:85 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:255 msgid "Integration" -msgstr "" +msgstr "Integration" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:86 msgid "Status" -msgstr "" +msgstr "Status" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:126 msgid "Fast, High Capacity" -msgstr "" +msgstr "Schnell, hohe Kapazität" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:127 msgid "High Capacity" -msgstr "" +msgstr "Hohe Kapazität" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:128 msgid "Standard" -msgstr "" +msgstr "Standard" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:129 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:163 msgid "Failing" -msgstr "" +msgstr "Versagend" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:249 msgid "Integrated" -msgstr "" +msgstr "Integriert" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:162 msgid "Banned" -msgstr "" +msgstr "Gebannt" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:164 msgid "Unreachable" -msgstr "" +msgstr "Unerreichbar" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:171 msgid "Test Fails" -msgstr "" +msgstr "Test schlägt fehl" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:175 msgid "profile" -msgstr "" +msgstr "Profil" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:184 msgid "Floodfill and Integrated Peers" -msgstr "" +msgstr "Floodfill und integrierte Kontakte" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:188 msgid "Caps" -msgstr "" +msgstr "Werte" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:189 msgid "Integ. Value" -msgstr "" +msgstr "Integrations Wert" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:190 msgid "Last Heard About" -msgstr "" +msgstr "Letzte Nachricht emfangen" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:191 msgid "Last Heard From" -msgstr "" +msgstr "Letztens davon gehört" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:192 msgid "Last Good Send" -msgstr "" +msgstr "Letzter gute Aussendung" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:193 msgid "Last Bad Send" -msgstr "" +msgstr "Letzte schlechte Aussendung" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:194 msgid "10m Resp. Time" -msgstr "" +msgstr "10min Antwortzeit" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:195 msgid "1h Resp. Time" -msgstr "" +msgstr "1h Antwortzeit" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:196 msgid "1d Resp. Time" -msgstr "" +msgstr "1 Tag Antwortzeit" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:197 msgid "Last Good Lookup" -msgstr "" +msgstr "Letzte gute Suche" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:198 msgid "Last Bad Lookup" -msgstr "" +msgstr "Letzte schlechte Suche" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:199 msgid "Last Good Store" -msgstr "" +msgstr "Letzte gute Sicherung" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200 msgid "Last Bad Store" -msgstr "" +msgstr "Letzte schlechte Sicherung" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:201 msgid "1h Fail Rate" -msgstr "" +msgstr "1h Fehlerrate" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202 msgid "1d Fail Rate" -msgstr "" +msgstr "1 Tag Fehlerrate" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:250 msgid "Thresholds" -msgstr "" +msgstr "Grenzwert" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:252 msgid "fast peers" -msgstr "" +msgstr "schnelle Kontakte" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:254 msgid "high capacity peers" -msgstr "" +msgstr "Kontakte hohe Kapazität" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:256 msgid " well integrated peers" -msgstr "" +msgstr "gut integrierte Kontakte" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:257 msgid "Definitions" -msgstr "" +msgstr "Definitionen" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:258 msgid "as determined by the profile organizer" -msgstr "" +msgstr "wie vom Profilorganisator ermittelt" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:258 msgid "groups" -msgstr "" +msgstr "Gruppen" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "capabilities in the netDb, not used to determine profiles" -msgstr "" +msgstr "Kapazitäten in der Netzwerkdatenbank, nicht zum ermitteln der Profile verwendet" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "caps" -msgstr "" +msgstr "Werte" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 msgid "" "peak throughput (bytes per second) over a 1 minute period that the peer has " "sustained in a single tunnel" -msgstr "" +msgstr "Maximaler Durchsatz (Byte je Tunnel) über den Zeitraum von einer Minute den ein Kontakt in einem Tunnel erreicht hat" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 msgid "speed" -msgstr "" +msgstr "Geschwindigkeit" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "capacity" -msgstr "" +msgstr "Kapazität" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "how many tunnels can we ask them to join in an hour?" -msgstr "" +msgstr "Wie viele Tunnelnachfragen pro Stunde können wir bei ihm nachfragen?" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 msgid "how many new peers have they told us about lately?" -msgstr "" +msgstr "Wie viele neue Kontakte haben sie uns die letzte Zeit genannt?" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 msgid "integration" -msgstr "" +msgstr "Integration" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "is the peer banned, or unreachable, or failing tunnel tests?" -msgstr "" +msgstr "Ist der Kontakt gebannt, unerreichbar or schlagen die Tunneltests fehl?" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "status" -msgstr "" +msgstr "Status" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:321 msgid "n/a" -msgstr "" +msgstr "n/a" #: ../java/src/net/i2p/router/web/ShitlistRenderer.java:57 #, java-format msgid "Temporary ban expiring in {0}" -msgstr "" +msgstr "Zeitweiser Bann endet in {0}" #: ../java/src/net/i2p/router/web/ShitlistRenderer.java:59 #, java-format msgid "Banned until restart or in {0}" -msgstr "" +msgstr "Gebannt bis zum Neustart oder in {0}" #: ../java/src/net/i2p/router/web/ShitlistRenderer.java:71 msgid "unban now" -msgstr "" +msgstr "Hebe den Bann jetzt auf" #: ../java/src/net/i2p/router/web/StatsGenerator.java:58 msgid "Statistics gathered during this router's uptime" -msgstr "" +msgstr "Zur Laufzeit dieses Routers gesammelte Statistiken" #: ../java/src/net/i2p/router/web/StatsGenerator.java:61 msgid "" "The data gathered is quantized over a 1 minute period, so should just be " "used as an estimate." -msgstr "" +msgstr "Die gesammelten Daten wurden nur über 1 Minute gesammelt und sollten somit nur als Näherung betrachtet werden" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:40 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" -msgstr "" +msgstr "Einstellungen zu Klienten und WebApplikationen (Services); manuelles Starten der ruhenden Services" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:42 msgid "I2P Services" -msgstr "" +msgstr "I2P Services" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:48 msgid "Manage your I2P hosts file here (I2P domain name resolution)" -msgstr "" +msgstr "Verwalte hier deine I2P Adressen (I2P Namensauflösung)" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:50 msgid "Addressbook" -msgstr "" +msgstr "Adressbuch" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:54 msgid "Built-in anonymous BitTorrent Client" -msgstr "" +msgstr "Integrierter anonymer BitTorrent Klient" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:56 msgid "Torrents" -msgstr "" +msgstr "Torrents" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:60 msgid "Anonymous webmail client" -msgstr "" +msgstr "Klient für anonyme EMail" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:62 msgid "Webmail" -msgstr "" +msgstr "Webmail" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:66 msgid "Anonymous resident webserver" -msgstr "" +msgstr "Residenter anonymoer Webserver" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:68 msgid "Webserver" -msgstr "" +msgstr "Webserver" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:72 msgid "Configure I2P Router" -msgstr "" +msgstr "Konfiguriere den I2P Router" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:74 msgid "I2P Internals" -msgstr "" +msgstr "I2P Internas" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:80 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:344 msgid "View existing tunnels and tunnel build status" -msgstr "" +msgstr "Betrachte die exitierenden Tunnel und den Status der Tunnelerstellung" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:86 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Show all current peer connections" -msgstr "" +msgstr "Zeige alle derzeitigen Kontakt Verbindungen" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:92 msgid "Show recent peer performance profiles" From ec8130f44313d20e1425573a7849b5ca3d6b3c15 Mon Sep 17 00:00:00 2001 From: russiansponsor Date: Sun, 6 Dec 2009 03:54:21 +0000 Subject: [PATCH 037/127] Improved readme_ru.html translation. All strings in messages_ru.po translated roughly. A few words in messages_ru.po edited for excessive length. --- apps/routerconsole/locale/messages_ru.po | 1084 +++++++++++---------- installer/resources/readme/readme_ru.html | 117 +-- 2 files changed, 590 insertions(+), 611 deletions(-) diff --git a/apps/routerconsole/locale/messages_ru.po b/apps/routerconsole/locale/messages_ru.po index d537ed8d6..03c4d3aba 100644 --- a/apps/routerconsole/locale/messages_ru.po +++ b/apps/routerconsole/locale/messages_ru.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P routerconsole\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 12:45+0000\n" -"PO-Revision-Date: 2009-12-05 18:36+0300\n" +"POT-Creation-Date: 2009-12-05 19:47+0000\n" +"PO-Revision-Date: 2009-12-06 05:44+0300\n" "Last-Translator: Russian Sponsor \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -247,143 +247,143 @@ msgstr "Беларусь" #: ../java/build/Countries.java:38 msgid "Belize" -msgstr "" +msgstr "Белиз" #: ../java/build/Countries.java:39 msgid "Canada" -msgstr "" +msgstr "Канада" #: ../java/build/Countries.java:40 msgid "The Democratic Republic of the Congo" -msgstr "" +msgstr "Демократическая Республика Конго" #: ../java/build/Countries.java:41 msgid "Central African Republic" -msgstr "" +msgstr "Центральноафриканская Республика" #: ../java/build/Countries.java:42 msgid "Congo" -msgstr "" +msgstr "Конго" #: ../java/build/Countries.java:43 msgid "Switzerland" -msgstr "" +msgstr "Швейцария" #: ../java/build/Countries.java:44 msgid "Cote D'Ivoire" -msgstr "" +msgstr "Кот-д'Ивуар" #: ../java/build/Countries.java:45 msgid "Cook Islands" -msgstr "" +msgstr "Острова Кука" #: ../java/build/Countries.java:46 msgid "Chile" -msgstr "" +msgstr "Чили" #: ../java/build/Countries.java:47 msgid "Cameroon" -msgstr "" +msgstr "Камерун" #: ../java/build/Countries.java:48 msgid "China" -msgstr "" +msgstr "Китай" #: ../java/build/Countries.java:49 msgid "Colombia" -msgstr "" +msgstr "Колумбия" #: ../java/build/Countries.java:50 msgid "Costa Rica" -msgstr "" +msgstr "Коста-Рика" #: ../java/build/Countries.java:51 msgid "Serbia and Montenegro" -msgstr "" +msgstr "Сербия и Черногория" #: ../java/build/Countries.java:52 msgid "Cuba" -msgstr "" +msgstr "Куба" #: ../java/build/Countries.java:53 msgid "Cape Verde" -msgstr "" +msgstr "Кабо-Верде" #: ../java/build/Countries.java:54 msgid "Cyprus" -msgstr "" +msgstr "Кипр" #: ../java/build/Countries.java:55 msgid "Czech Republic" -msgstr "" +msgstr "Чехия" #: ../java/build/Countries.java:56 msgid "Germany" -msgstr "" +msgstr "Германия" #: ../java/build/Countries.java:57 msgid "Djibouti" -msgstr "" +msgstr "Джибути" #: ../java/build/Countries.java:58 msgid "Denmark" -msgstr "" +msgstr "Дания" #: ../java/build/Countries.java:59 msgid "Dominica" -msgstr "" +msgstr "Доминика" #: ../java/build/Countries.java:60 msgid "Dominican Republic" -msgstr "" +msgstr "Доминиканская Республика" #: ../java/build/Countries.java:61 msgid "Algeria" -msgstr "" +msgstr "Алжир" #: ../java/build/Countries.java:62 msgid "Ecuador" -msgstr "" +msgstr "Эквадор" #: ../java/build/Countries.java:63 msgid "Estonia" -msgstr "" +msgstr "Эстония" #: ../java/build/Countries.java:64 msgid "Egypt" -msgstr "" +msgstr "Египет" #: ../java/build/Countries.java:65 msgid "Eritrea" -msgstr "" +msgstr "Эритрея" #: ../java/build/Countries.java:66 msgid "Spain" -msgstr "" +msgstr "Испания" #: ../java/build/Countries.java:67 msgid "Ethiopia" -msgstr "" +msgstr "Эфиопия" #: ../java/build/Countries.java:68 msgid "Finland" -msgstr "" +msgstr "Финляндия" #: ../java/build/Countries.java:69 msgid "Fiji" -msgstr "" +msgstr "Фиджи" #: ../java/build/Countries.java:70 msgid "Falkland Islands (Malvinas)" -msgstr "" +msgstr "Фолклендские (Мальвинские)" #: ../java/build/Countries.java:71 msgid "Federated States of Micronesia" -msgstr "" +msgstr "Федеративные Штаты Микронезии" #: ../java/build/Countries.java:72 msgid "Faroe Islands" -msgstr "" +msgstr "Фарерские острова" #: ../java/build/Countries.java:73 msgid "France" @@ -391,75 +391,75 @@ msgstr "Франция" #: ../java/build/Countries.java:74 msgid "Gabon" -msgstr "" +msgstr "Габон" #: ../java/build/Countries.java:75 msgid "United Kingdom" -msgstr "" +msgstr "Великобритания" #: ../java/build/Countries.java:76 msgid "Grenada" -msgstr "" +msgstr "Гренада" #: ../java/build/Countries.java:77 msgid "Georgia" -msgstr "" +msgstr "Грузия" #: ../java/build/Countries.java:78 msgid "French Guiana" -msgstr "" +msgstr "Французская Гвиана" #: ../java/build/Countries.java:79 msgid "Ghana" -msgstr "" +msgstr "Гана" #: ../java/build/Countries.java:80 msgid "Gibraltar" -msgstr "" +msgstr "Гибралтар" #: ../java/build/Countries.java:81 msgid "Greenland" -msgstr "" +msgstr "Гренландия" #: ../java/build/Countries.java:82 msgid "Gambia" -msgstr "" +msgstr "Гамбия" #: ../java/build/Countries.java:83 msgid "Guinea" -msgstr "" +msgstr "Гвинея" #: ../java/build/Countries.java:84 msgid "Guadeloupe" -msgstr "" +msgstr "Гваделупа" #: ../java/build/Countries.java:85 msgid "Equatorial Guinea" -msgstr "" +msgstr "Экваториальная Гвинея" #: ../java/build/Countries.java:86 msgid "Greece" -msgstr "" +msgstr "Греция" #: ../java/build/Countries.java:87 msgid "South Georgia and the South Sandwich Islands" -msgstr "" +msgstr "Южная Джорджия и Южные Сандвичевы Острова" #: ../java/build/Countries.java:88 msgid "Guatemala" -msgstr "" +msgstr "Гватемала" #: ../java/build/Countries.java:89 msgid "Guam" -msgstr "" +msgstr "Гуам" #: ../java/build/Countries.java:90 msgid "Guinea-Bissau" -msgstr "" +msgstr "Гвинея-Бисау" #: ../java/build/Countries.java:91 msgid "Guyana" -msgstr "" +msgstr "Гайана" #: ../java/build/Countries.java:92 msgid "Hong Kong" @@ -467,572 +467,572 @@ msgstr "Гонконг" #: ../java/build/Countries.java:93 msgid "Honduras" -msgstr "" +msgstr "Гондурас" #: ../java/build/Countries.java:94 msgid "Croatia" -msgstr "" +msgstr "Хорватия" #: ../java/build/Countries.java:95 msgid "Haiti" -msgstr "" +msgstr "Гаити" #: ../java/build/Countries.java:96 msgid "Hungary" -msgstr "" +msgstr "Венгрия" #: ../java/build/Countries.java:97 msgid "Indonesia" -msgstr "" +msgstr "Индонезия" #: ../java/build/Countries.java:98 msgid "Ireland" -msgstr "" +msgstr "Ирландия" #: ../java/build/Countries.java:99 msgid "Israel" -msgstr "" +msgstr "Израиль" #: ../java/build/Countries.java:101 msgid "India" -msgstr "" +msgstr "Индия" #: ../java/build/Countries.java:102 msgid "British Indian Ocean Territory" -msgstr "" +msgstr "Британская территория в Индийском океане" #: ../java/build/Countries.java:103 msgid "Iraq" -msgstr "" +msgstr "Ирак" #: ../java/build/Countries.java:104 msgid "Islamic Republic of Iran" -msgstr "" +msgstr "Исламская Республика Иран" #: ../java/build/Countries.java:105 msgid "Iceland" -msgstr "" +msgstr "Исландия" #: ../java/build/Countries.java:106 msgid "Italy" -msgstr "" +msgstr "Италия" #: ../java/build/Countries.java:108 msgid "Jamaica" -msgstr "" +msgstr "Ямайка" #: ../java/build/Countries.java:109 msgid "Jordan" -msgstr "" +msgstr "Иордания" #: ../java/build/Countries.java:110 msgid "Japan" -msgstr "" +msgstr "Япония" #: ../java/build/Countries.java:111 msgid "Kenya" -msgstr "" +msgstr "Кения" #: ../java/build/Countries.java:112 msgid "Kyrgyzstan" -msgstr "" +msgstr "Кыргызстан" #: ../java/build/Countries.java:113 msgid "Cambodia" -msgstr "" +msgstr "Камбоджа" #: ../java/build/Countries.java:114 msgid "Kiribati" -msgstr "" +msgstr "Кирибати" #: ../java/build/Countries.java:115 msgid "Comoros" -msgstr "" +msgstr "Коморские Острова" #: ../java/build/Countries.java:116 msgid "Saint Kitts and Nevis" -msgstr "" +msgstr "Сент-Китс и Невис" #: ../java/build/Countries.java:117 msgid "Republic of Korea" -msgstr "" +msgstr "Республика Корея" #: ../java/build/Countries.java:118 msgid "Kuwait" -msgstr "" +msgstr "Кувейт" #: ../java/build/Countries.java:119 msgid "Cayman Islands" -msgstr "" +msgstr "Каймановы острова" #: ../java/build/Countries.java:120 msgid "Kazakhstan" -msgstr "" +msgstr "Казахстан" #: ../java/build/Countries.java:121 msgid "Lao People's Democratic Republic" -msgstr "" +msgstr "Лаосская Народно-Демократическая Республика" #: ../java/build/Countries.java:122 msgid "Lebanon" -msgstr "" +msgstr "Ливан" #: ../java/build/Countries.java:123 msgid "Saint Lucia" -msgstr "" +msgstr "Сент-Люсия" #: ../java/build/Countries.java:124 msgid "Liechtenstein" -msgstr "" +msgstr "Лихтенштейн" #: ../java/build/Countries.java:125 msgid "Sri Lanka" -msgstr "" +msgstr "Шри-Ланка" #: ../java/build/Countries.java:126 msgid "Liberia" -msgstr "" +msgstr "Либерия" #: ../java/build/Countries.java:127 msgid "Lesotho" -msgstr "" +msgstr "Лесото" #: ../java/build/Countries.java:128 msgid "Lithuania" -msgstr "" +msgstr "Литва" #: ../java/build/Countries.java:129 msgid "Luxembourg" -msgstr "" +msgstr "Люксембург" #: ../java/build/Countries.java:130 msgid "Latvia" -msgstr "" +msgstr "Латвия" #: ../java/build/Countries.java:131 msgid "Libyan Arab Jamahiriya" -msgstr "" +msgstr "Ливийская Арабская Джамахирия" #: ../java/build/Countries.java:132 msgid "Morocco" -msgstr "" +msgstr "Марокко" #: ../java/build/Countries.java:133 msgid "Monaco" -msgstr "" +msgstr "Монако" #: ../java/build/Countries.java:134 msgid "Republic of Moldova" -msgstr "" +msgstr "Республика Молдова" #: ../java/build/Countries.java:137 msgid "Madagascar" -msgstr "" +msgstr "Мадагаскар" #: ../java/build/Countries.java:138 msgid "Marshall Islands" -msgstr "" +msgstr "Маршалловы Острова" #: ../java/build/Countries.java:139 msgid "The Former Yugoslav Republic of Macedonia" -msgstr "" +msgstr "Бывшая югославская Республика Македония" #: ../java/build/Countries.java:140 msgid "Mali" -msgstr "" +msgstr "Мали" #: ../java/build/Countries.java:141 msgid "Myanmar" -msgstr "" +msgstr "Мьянма" #: ../java/build/Countries.java:142 msgid "Mongolia" -msgstr "" +msgstr "Монголия" #: ../java/build/Countries.java:143 msgid "Macao" -msgstr "" +msgstr "Макао" #: ../java/build/Countries.java:144 msgid "Northern Mariana Islands" -msgstr "" +msgstr "Северные Марианские о-ва" #: ../java/build/Countries.java:145 msgid "Martinique" -msgstr "" +msgstr "Мартиника" #: ../java/build/Countries.java:146 msgid "Mauritania" -msgstr "" +msgstr "Мавритания" #: ../java/build/Countries.java:147 msgid "Montserrat" -msgstr "" +msgstr "Монтсеррат" #: ../java/build/Countries.java:148 msgid "Malta" -msgstr "" +msgstr "Мальта" #: ../java/build/Countries.java:149 msgid "Mauritius" -msgstr "" +msgstr "Маврикий" #: ../java/build/Countries.java:150 msgid "Maldives" -msgstr "" +msgstr "Мальдивы" #: ../java/build/Countries.java:151 msgid "Malawi" -msgstr "" +msgstr "Малави" #: ../java/build/Countries.java:152 msgid "Mexico" -msgstr "" +msgstr "Мексика" #: ../java/build/Countries.java:153 msgid "Malaysia" -msgstr "" +msgstr "Малайзия" #: ../java/build/Countries.java:154 msgid "Mozambique" -msgstr "" +msgstr "Мозамбик" #: ../java/build/Countries.java:155 msgid "Namibia" -msgstr "" +msgstr "Мозамбик" #: ../java/build/Countries.java:156 msgid "New Caledonia" -msgstr "" +msgstr "Новая Каледония" #: ../java/build/Countries.java:157 msgid "Niger" -msgstr "" +msgstr "Нигер" #: ../java/build/Countries.java:158 msgid "Norfolk Island" -msgstr "" +msgstr "Остров Норфолк" #: ../java/build/Countries.java:159 msgid "Nigeria" -msgstr "" +msgstr "Нигерия" #: ../java/build/Countries.java:160 msgid "Nicaragua" -msgstr "" +msgstr "Никарагуа" #: ../java/build/Countries.java:161 msgid "Netherlands" -msgstr "" +msgstr "Нидерланды" #: ../java/build/Countries.java:162 msgid "Norway" -msgstr "" +msgstr "Норвегия" #: ../java/build/Countries.java:163 msgid "Nepal" -msgstr "" +msgstr "Непал" #: ../java/build/Countries.java:164 msgid "Nauru" -msgstr "" +msgstr "Науру" #: ../java/build/Countries.java:165 msgid "Niue" -msgstr "" +msgstr "Ниуэ" #: ../java/build/Countries.java:166 msgid "New Zealand" -msgstr "" +msgstr "Новая Зеландия" #: ../java/build/Countries.java:167 msgid "Oman" -msgstr "" +msgstr "Оман" #: ../java/build/Countries.java:168 msgid "Panama" -msgstr "" +msgstr "Панама" #: ../java/build/Countries.java:169 msgid "Peru" -msgstr "" +msgstr "Перу" #: ../java/build/Countries.java:170 msgid "French Polynesia" -msgstr "" +msgstr "Французская Полинезия" #: ../java/build/Countries.java:171 msgid "Papua New Guinea" -msgstr "" +msgstr "Папуа-Новая Гвинея" #: ../java/build/Countries.java:172 msgid "Philippines" -msgstr "" +msgstr "Филиппины" #: ../java/build/Countries.java:173 msgid "Pakistan" -msgstr "" +msgstr "Пакистан" #: ../java/build/Countries.java:174 msgid "Poland" -msgstr "" +msgstr "Польша" #: ../java/build/Countries.java:175 msgid "Saint Pierre and Miquelon" -msgstr "" +msgstr "Сен-Пьер и Микелон" #: ../java/build/Countries.java:176 msgid "Puerto Rico" -msgstr "" +msgstr "Пуэрто-Рико" #: ../java/build/Countries.java:177 msgid "Palestinian Territory" -msgstr "" +msgstr "Палестинская автономия" #: ../java/build/Countries.java:178 msgid "Portugal" -msgstr "" +msgstr "Португалия" #: ../java/build/Countries.java:179 msgid "Palau" -msgstr "" +msgstr "Палау" #: ../java/build/Countries.java:180 msgid "Paraguay" -msgstr "" +msgstr "Парагвай" #: ../java/build/Countries.java:181 msgid "Qatar" -msgstr "" +msgstr "Катар" #: ../java/build/Countries.java:182 msgid "Reunion" -msgstr "" +msgstr "Реюньон" #: ../java/build/Countries.java:183 msgid "Romania" -msgstr "" +msgstr "Румыния" #: ../java/build/Countries.java:184 msgid "Serbia" -msgstr "" +msgstr "Сербия" #: ../java/build/Countries.java:185 msgid "Russian Federation" -msgstr "" +msgstr "Русская Федерация" #: ../java/build/Countries.java:186 msgid "Rwanda" -msgstr "" +msgstr "Руанда" #: ../java/build/Countries.java:187 msgid "Saudi Arabia" -msgstr "" +msgstr "Саудовская Аравия" #: ../java/build/Countries.java:188 msgid "Solomon Islands" -msgstr "" +msgstr "Соломоновы Острова" #: ../java/build/Countries.java:189 msgid "Seychelles" -msgstr "" +msgstr "Сейшельские Острова" #: ../java/build/Countries.java:190 msgid "Sudan" -msgstr "" +msgstr "Судан" #: ../java/build/Countries.java:191 msgid "Sweden" -msgstr "" +msgstr "Швеция" #: ../java/build/Countries.java:192 msgid "Singapore" -msgstr "" +msgstr "Сингапур" #: ../java/build/Countries.java:193 msgid "Slovenia" -msgstr "" +msgstr "Словения" #: ../java/build/Countries.java:194 msgid "Slovakia" -msgstr "" +msgstr "Словакия" #: ../java/build/Countries.java:195 msgid "Sierra Leone" -msgstr "" +msgstr "Сьерра-Леоне" #: ../java/build/Countries.java:196 msgid "San Marino" -msgstr "" +msgstr "Сан - Марине" #: ../java/build/Countries.java:197 msgid "Senegal" -msgstr "" +msgstr "Сенегал" #: ../java/build/Countries.java:198 msgid "Somalia" -msgstr "" +msgstr "Сомали" #: ../java/build/Countries.java:199 msgid "Suriname" -msgstr "" +msgstr "Суринам" #: ../java/build/Countries.java:200 msgid "Sao Tome and Principe" -msgstr "" +msgstr "Сан-Томе и Принсипи" #: ../java/build/Countries.java:201 msgid "El Salvador" -msgstr "" +msgstr "Сальвадор" #: ../java/build/Countries.java:202 msgid "Syrian Arab Republic" -msgstr "" +msgstr "Сирийская Арабская Республика" #: ../java/build/Countries.java:203 msgid "Swaziland" -msgstr "" +msgstr "Свазиленд" #: ../java/build/Countries.java:204 msgid "Turks and Caicos Islands" -msgstr "" +msgstr "Острова Теркс и Кайкос" #: ../java/build/Countries.java:205 msgid "Chad" -msgstr "" +msgstr "Чад" #: ../java/build/Countries.java:206 msgid "French Southern Territories" -msgstr "" +msgstr "Французские Южные Территории" #: ../java/build/Countries.java:207 msgid "Togo" -msgstr "" +msgstr "Того" #: ../java/build/Countries.java:208 msgid "Thailand" -msgstr "" +msgstr "Таиланд" #: ../java/build/Countries.java:209 msgid "Tajikistan" -msgstr "" +msgstr "Таджикистан" #: ../java/build/Countries.java:210 msgid "Tokelau" -msgstr "" +msgstr "Токелау" #: ../java/build/Countries.java:211 msgid "Timor-Leste" -msgstr "" +msgstr "Восточный Тимор" #: ../java/build/Countries.java:212 msgid "Turkmenistan" -msgstr "" +msgstr "Туркменистан" #: ../java/build/Countries.java:213 msgid "Tunisia" -msgstr "" +msgstr "Тунис" #: ../java/build/Countries.java:214 msgid "Tonga" -msgstr "" +msgstr "Тонга" #: ../java/build/Countries.java:215 msgid "Turkey" -msgstr "" +msgstr "Турция" #: ../java/build/Countries.java:216 msgid "Trinidad and Tobago" -msgstr "" +msgstr "Тринидад и Тобаго" #: ../java/build/Countries.java:217 msgid "Tuvalu" -msgstr "" +msgstr "Тувалу" #: ../java/build/Countries.java:218 msgid "Taiwan" -msgstr "" +msgstr "Тайвань" #: ../java/build/Countries.java:219 msgid "United Republic of Tanzania" -msgstr "" +msgstr "Объединенная Республика Танзания" #: ../java/build/Countries.java:220 msgid "Ukraine" -msgstr "" +msgstr "Украина" #: ../java/build/Countries.java:221 msgid "Uganda" -msgstr "" +msgstr "Уганда" #: ../java/build/Countries.java:222 msgid "United States Minor Outlying Islands" -msgstr "" +msgstr "Внешние малые острова (США)" #: ../java/build/Countries.java:223 msgid "United States" -msgstr "" +msgstr "Соединенные Штаты Америки" #: ../java/build/Countries.java:224 msgid "Uruguay" -msgstr "" +msgstr "Уругвай" #: ../java/build/Countries.java:225 msgid "Uzbekistan" -msgstr "" +msgstr "Узбекистан" #: ../java/build/Countries.java:226 msgid "Holy See (Vatican City State)" -msgstr "" +msgstr "Святой Престол (Ватикан)" #: ../java/build/Countries.java:227 msgid "Saint Vincent and the Grenadines" -msgstr "" +msgstr "Сент-Винсент и Гренадины" #: ../java/build/Countries.java:228 msgid "Venezuela" -msgstr "" +msgstr "Венесуэла" #: ../java/build/Countries.java:229 #: ../java/build/Countries.java:230 msgid "Virgin Islands" -msgstr "" +msgstr "Виргинские острова" #: ../java/build/Countries.java:231 msgid "Viet Nam" -msgstr "" +msgstr "Вьетнам" #: ../java/build/Countries.java:232 msgid "Vanuatu" -msgstr "" +msgstr "Вануату" #: ../java/build/Countries.java:233 msgid "Wallis and Futuna" -msgstr "" +msgstr "Уоллис и Футуна" #: ../java/build/Countries.java:234 msgid "Samoa" -msgstr "" +msgstr "Самоа" #: ../java/build/Countries.java:235 msgid "Yemen" -msgstr "" +msgstr "Йемен" #: ../java/build/Countries.java:236 msgid "Mayotte" -msgstr "" +msgstr "Майотта" #: ../java/build/Countries.java:237 msgid "South Africa" -msgstr "" +msgstr "Южная Африка" #: ../java/build/Countries.java:238 msgid "Zambia" -msgstr "" +msgstr "Замбия" #: ../java/build/Countries.java:239 msgid "Zimbabwe" -msgstr "" +msgstr "Зимбабве" #: ../java/src/net/i2p/router/web/CSSHelper.java:41 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:26 @@ -1044,17 +1044,17 @@ msgstr "Консоль Маршрутизатора I2P" #: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:57 msgid "Error updating the configuration - please see the error logs" -msgstr "" +msgstr "Ошибка при обновлении конфигурации - смотрите логи ошибок" #: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:69 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:251 msgid "Configuration saved successfully" -msgstr "" +msgstr "Конфигурация успешно сохранены" #: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:253 msgid "Error saving the configuration (applied but not saved) - please see the error logs" -msgstr "" +msgstr "Ошибка при сохранении конфигурации (применяется, но не сохранили) - пожалуйста, смотрите логи ошибок" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:32 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:321 @@ -1069,20 +1069,20 @@ msgstr "Сохранять WebApp Конфигурацию" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:54 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:67 msgid "Start" -msgstr "" +msgstr "Включать" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:68 #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:49 msgid "Unsupported" -msgstr "" +msgstr "Неподдерживаемый" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:83 msgid "Client configuration saved successfully - restart required to take effect." -msgstr "" +msgstr "Настройка клиента успешно сохранены - Требуется перезагрузка вступили в силу." #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:89 msgid "Bad client index." -msgstr "" +msgstr "Индекс плохой клиент." #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:94 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:17 @@ -1094,42 +1094,42 @@ msgstr "Клиент" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:94 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:129 msgid "started" -msgstr "" +msgstr "началось" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:111 msgid "WebApp configuration saved successfully - restart required to take effect." -msgstr "" +msgstr "Конфигурация веб-приложений успешно сохранены - Требуется перезагрузка вступили в силу." #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:129 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:34 msgid "WebApp" -msgstr "" +msgstr "Веб-приложение" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:131 msgid "Failed to start" -msgstr "" +msgstr "Сбой при запуске" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:137 msgid "Failed to find server." -msgstr "" +msgstr "Не удалось найти сервер." #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:17 msgid "Class and arguments" -msgstr "" +msgstr "Класс и параметры" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:17 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:34 msgid "Run at Startup?" -msgstr "" +msgstr "Запустить при следующем запуске системы?" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:17 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:34 msgid "Start Now" -msgstr "" +msgstr "Запустить Cейчас" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:34 msgid "Description" -msgstr "" +msgstr "Описание" #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:18 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:320 @@ -1143,65 +1143,65 @@ msgstr "Удалить ключ" #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:21 msgid "You must enter a destination" -msgstr "" +msgstr "Вы должны ввести назначения" #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:23 msgid "You must enter a key" -msgstr "" +msgstr "Вы должны ввести ключевые" #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:34 #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:41 #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:43 msgid "Key for" -msgstr "" +msgstr "Ключ для" #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:34 msgid "added to keyring" -msgstr "" +msgstr "добавить в связку ключей" #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:36 msgid "Invalid destination or key" -msgstr "" +msgstr "Invalid destination or key" #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:41 msgid "removed from keyring" -msgstr "" +msgstr "удалены из связку ключей" #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:43 msgid "not found in keyring" -msgstr "" +msgstr "Не найдено в связку ключей" #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:45 msgid "Invalid destination" -msgstr "" +msgstr "Invalid destination" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52 msgid "CRIT" -msgstr "" +msgstr "КРИТИЧЕСКИЕ" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52 msgid "DEBUG" -msgstr "" +msgstr "ОТЛАДКА" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52 msgid "ERROR" -msgstr "" +msgstr "ОШИБКА" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52 msgid "INFO" -msgstr "" +msgstr "ИНФОРМАЦИЯ" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52 msgid "WARN" -msgstr "" +msgstr "ПРЕДУПРЕЖДЕНИЕ" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18 msgid "Network" -msgstr "" +msgstr "Сеть" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18 msgid "Service" -msgstr "" +msgstr "Сервис" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:82 @@ -1211,13 +1211,13 @@ msgstr "Туннели" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18 msgid "UI" -msgstr "" +msgstr "Интерфейс Пользователя" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:205 msgid "Update" -msgstr "" +msgstr "Обновление" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 msgid "Clients" @@ -1226,11 +1226,11 @@ msgstr "Клиенты" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:292 msgid "Keyring" -msgstr "хранения данных" +msgstr "Cвязку Kлючей" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 msgid "Logging" -msgstr "" +msgstr "Логи" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:88 @@ -1246,7 +1246,7 @@ msgstr "Статистика" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20 msgid "Advanced" -msgstr "" +msgstr "Расширенный" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:47 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:249 @@ -1261,75 +1261,75 @@ msgstr "Сохранить изменения" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:119 msgid "Rechecking router reachability..." -msgstr "" +msgstr "Повторная проверка доступности маршрутизатора..." #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:148 msgid "Updating IP address" -msgstr "" +msgstr "Обновление IP-адреса" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:166 msgid "Disabling TCP completely" -msgstr "" +msgstr "Отключение TCP полностью" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:170 msgid "Updating inbound TCP address to" -msgstr "" +msgstr "Обновление входящего в адрес TCP" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:174 msgid "Disabling inbound TCP" -msgstr "" +msgstr "Отключение входящие TCP" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:176 msgid "Updating inbound TCP address to auto" -msgstr "" +msgstr "Обновление входящего адреса TCP автоматически" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:185 msgid "Updating inbound TCP port to" -msgstr "" +msgstr "Обновление входящего порта TCP для" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:188 msgid "Updating inbound TCP port to auto" -msgstr "" +msgstr "Обновление входящего порта TCP автоматически" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:200 msgid "Updating UDP port from" -msgstr "" +msgstr "Обновление от UDP порта" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:200 msgid "to" -msgstr "" +msgstr "к" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:216 msgid "Gracefully restarting into Hidden Router Mode" -msgstr "" +msgstr "Правильно перезапуска в скрытые режиме маршрутизатора" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:218 msgid "Gracefully restarting to exit Hidden Router Mode" -msgstr "" +msgstr "Правильно перезапуска для выхода Скрытый режим маршрутизатора" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:227 msgid "Enabling UPnP, restart required to take effect" -msgstr "" +msgstr "Включение UPnP, необходима перезагрузка вступили в силу" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:229 msgid "Disabling UPnP, restart required to take effect" -msgstr "" +msgstr "Отключение UPnP, необходима перезагрузка вступили в силу" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:235 msgid "Requiring SSU introduers" -msgstr "" +msgstr "Требование SSU поручителями" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:275 msgid "Gracefully restarting I2P to change published router address" -msgstr "" +msgstr "Правильно перезапуска I2P изменить опубликован адрес маршрутизатора" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:293 msgid "Updating bandwidth share percentage" -msgstr "" +msgstr "Обновление пропускную процентной доли" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:363 msgid "Updated bandwidth limits" -msgstr "" +msgstr "Обновлен пределы полосы пропускания" #: ../java/src/net/i2p/router/web/ConfigNetHelper.java:39 #: ../java/src/net/i2p/router/web/ConfigNetHelper.java:47 @@ -1341,7 +1341,7 @@ msgstr "неизвестный" #: ../java/src/net/i2p/router/web/ConfigNetHelper.java:165 msgid "bits per second" -msgstr "" +msgstr "бит в секунду" #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:20 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:314 @@ -1360,17 +1360,17 @@ msgstr "Вручную запретили через {0}" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:187 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:235 msgid "Peer" -msgstr "" +msgstr "Пир" #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:24 msgid "banned until restart" -msgstr "" +msgstr "Запрещена пока перезагрузка" #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:27 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:38 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:59 msgid "Invalid peer" -msgstr "" +msgstr "Неверное сверстников" #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:28 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:316 @@ -1379,11 +1379,11 @@ msgstr "Отмена запрета пира" #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:33 msgid "unbanned" -msgstr "" +msgstr "запрет удален" #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:35 msgid "is not currently banned" -msgstr "" +msgstr "в настоящее время не запрещена" #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:39 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:322 @@ -1392,11 +1392,11 @@ msgstr "Настройка дополнительных потоков проф #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:47 msgid "Bad speed value" -msgstr "" +msgstr "Неправильное значение скорости" #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:52 msgid "Bad capacity value" -msgstr "" +msgstr "Неправильное значение потенциала" #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:32 #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:57 @@ -1406,7 +1406,7 @@ msgstr "Выключить сразу" #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:36 msgid "Cancel shutdown" -msgstr "" +msgstr "Отмена выключения" #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:37 msgid "Cancel restart" @@ -1414,7 +1414,7 @@ msgstr "Отмена перезагрузка" #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:39 msgid "Restart immediately" -msgstr "" +msgstr "Перезагрузка сразу" #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:43 msgid "Restart" @@ -1426,7 +1426,7 @@ msgstr "Выключение" #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:57 msgid "Shutdown imminent" -msgstr "" +msgstr "Выключения неминуемого" #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:60 #, java-format @@ -1445,11 +1445,11 @@ msgstr "Грациозно выключить" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:56 msgid "Graceful shutdown initiated" -msgstr "" +msgstr "Изящный выключение инициативе" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:60 msgid "Shutdown immediately! boom bye bye bad bwoy" -msgstr "" +msgstr "выключения немедленно! бум пока пока плохой мальчик" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:61 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:294 @@ -1458,7 +1458,7 @@ msgstr "Отмена изящные выключении" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:63 msgid "Graceful shutdown cancelled" -msgstr "" +msgstr "Изящный выключения отменен" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:64 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:308 @@ -1467,7 +1467,7 @@ msgstr "Мягкого перезапуска" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:67 msgid "Graceful restart requested" -msgstr "" +msgstr "Мягкого перезапуска просил" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:68 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:310 @@ -1476,23 +1476,23 @@ msgstr "Жесткая перезагрузка" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:71 msgid "Hard restart requested" -msgstr "" +msgstr "Жесткая перезагрузка просил" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:72 msgid "Rekey and Restart" -msgstr "" +msgstr "Восстановить Ключ и Перезагрузите" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:73 msgid "Rekeying after graceful restart" -msgstr "" +msgstr "Повторный ввод после мягкого перезапуска" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:76 msgid "Rekey and Shutdown" -msgstr "" +msgstr "Восстановить Ключ и Выключении" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:77 msgid "Rekeying after graceful shutdown" -msgstr "" +msgstr "Повторный ввод после выключения изящный" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:80 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:338 @@ -1507,7 +1507,7 @@ msgstr "Не запускать при запуске I2P" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:84 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:356 msgid "Dump threads" -msgstr "ССамосвал память" +msgstr "Сваливать Память" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:91 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:324 @@ -1516,17 +1516,17 @@ msgstr "Показать системном трее значок" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:96 msgid "System tray icon enabled." -msgstr "" +msgstr "Значок на панели задач включена." #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:110 msgid "System tray icon feature not supported on this platform. Sorry!" -msgstr "" +msgstr "Значок на панели задач функция не поддерживается на этой платформе. Извините!" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:101 #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:113 msgid "Warning: unable to contact the systray manager" -msgstr "" +msgstr "Предупреждение: Не удается связаться с менеджером системный трей" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:103 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:326 @@ -1535,7 +1535,7 @@ msgstr "Скрыть системном трее значок" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:108 msgid "System tray icon disabled." -msgstr "" +msgstr "Значок на панели задач отключен." #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:115 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:364 @@ -1544,7 +1544,7 @@ msgstr "Открыть консоль при старте" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:117 msgid "Console is to be shown on startup" -msgstr "" +msgstr "Консоль будет показано при старте" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:118 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:366 @@ -1553,60 +1553,60 @@ msgstr "Не рассматривают консоль при старте" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:120 msgid "Console is not to be shown on startup" -msgstr "" +msgstr "Консоли не будет показано при старте" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:129 msgid "Service installed" -msgstr "" +msgstr "Установлена служба" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:131 msgid "Warning: unable to install the service" -msgstr "" +msgstr "Предупреждение: не удалось установить службу" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:137 msgid "Service removed" -msgstr "" +msgstr "Служба удалена" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:139 msgid "Warning: unable to remove the service" -msgstr "" +msgstr "Предупреждение: Не удается удалить службу" #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:118 msgid "Stat filter and location updated successfully to" -msgstr "" +msgstr "Стат фильтра и расположения успешно обновлена до" #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:120 msgid "Failed to update the stat filter and location" -msgstr "" +msgstr "Не удалось обновить фильтра стат и местоположение" #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:121 msgid "Graph list updated, may take up to 60s to be reflected here and on the Graphs Page" -msgstr "" +msgstr "Графика список обновляется, может занять до 60s должно быть отражено здесь и на графов странице " #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:137 msgid "Updated settings for all pools." -msgstr "" +msgstr "Обновление настройки для всех бассейнов." #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:142 msgid "Exploratory tunnel configuration saved successfully." -msgstr "" +msgstr "Разведочный конфигурации туннеля успешно сохранены." #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:144 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:36 msgid "Error saving the configuration (applied but not saved) - please see the error logs." -msgstr "" +msgstr "Ошибка при сохранении конфигурации (применяется, но не сохранили) - пожалуйста, смотрите логи ошибок." #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:11 msgid "hop" -msgstr "" +msgstr "хоп" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:12 msgid "tunnel" -msgstr "" +msgstr "туннель" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:14 msgid "hops" -msgstr "" +msgstr "хопа" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:15 msgid "tunnels" @@ -1620,59 +1620,59 @@ msgstr "Разведочные туннели" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:46 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:60 msgid "Client tunnels for" -msgstr "" +msgstr "Клиентские туннели для" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:69 msgid "ANONYMITY WARNING - Settings include 0-hop tunnels." -msgstr "" +msgstr "АНОНИМНОСТЬ ПРЕДУПРЕЖДЕНИЕ - Настройки включают 0-хоп туннелей." #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:74 msgid "ANONYMITY WARNING - Settings include 1-hop tunnels." -msgstr "" +msgstr "ANONYMITY WARNING - Settings include 1-hop tunnels." #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:77 msgid "PERFORMANCE WARNING - Settings include very long tunnels." -msgstr "" +msgstr "ИСПОЛНЕНИИ ВНИМАНИЕ - настройки включают в себя очень длинные туннели." #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:80 msgid "PERFORMANCE WARNING - Settings include high tunnel quantities." -msgstr "" +msgstr "ИСПОЛНЕНИИ ВНИМАНИЕ - настройки включают в больших количествах туннель." #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:82 msgid "Inbound" -msgstr "" +msgstr "Входящий" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:82 msgid "Outbound" -msgstr "" +msgstr "Исходящие" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:87 msgid "Depth" -msgstr "" +msgstr "Глубина" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:104 msgid "Randomization" -msgstr "" +msgstr "Рандомизации" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:128 msgid "Quantity" -msgstr "" +msgstr "Колич." #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:145 msgid "Backup quantity" -msgstr "" +msgstr "Резервное копирование количестве" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:167 msgid "Inbound options" -msgstr "" +msgstr "Входящий конфигурации" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:180 msgid "Outbound options" -msgstr "" +msgstr "Исходящие конфигурации" #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:31 msgid "Theme change saved." -msgstr "" +msgstr "Изменение сохраненной тема." #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:33 msgid "Refresh the page to view." @@ -1698,98 +1698,102 @@ msgstr "Китайский" msgid "Dutch" msgstr "Голландский" +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:42 +msgid "Russian" +msgstr "Русский" + #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:42 msgid "Swedish" -msgstr "" +msgstr "Шведский" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:56 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:310 msgid "Check for updates" -msgstr "" +msgstr "Проверка обновлений" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:63 msgid "Update available, attempting to download now" -msgstr "" +msgstr "Доступно обновление, пытаясь загрузить сейчас" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:65 msgid "Update available, click button on left to download" -msgstr "" +msgstr "Доступные обновления, нажмите кнопку на левой скачать" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:67 msgid "No update available" -msgstr "" +msgstr "Нет доступных обновлений" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:75 msgid "Updating news URL to" -msgstr "" +msgstr "Обновление новостей на URL" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:83 msgid "Updating proxy host to" -msgstr "" +msgstr "Обновление прокси-сервера для" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:91 msgid "Updating proxy port to" -msgstr "" +msgstr "Обновление прокси порта" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:104 msgid "Updating refresh frequency to" -msgstr "" +msgstr "Обновление частоту обновления для" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:111 msgid "Updating update policy to" -msgstr "" +msgstr "Updating update rules to" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:120 msgid "Updating update URLs." -msgstr "" +msgstr "Обновляет обновления URL-адресов." #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:128 msgid "Updating trusted keys." -msgstr "" +msgstr "Обновление доверенных ключей." #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:136 msgid "Updating unsigned update URL to" -msgstr "" +msgstr "Обновление неподписанных URL обновления" #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:75 #: ../java/src/net/i2p/router/web/GraphHelper.java:115 msgid "Never" -msgstr "" +msgstr "Никогда" #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:77 msgid "Every" -msgstr "" +msgstr "Каждый" #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:90 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:92 msgid "Notify only" -msgstr "" +msgstr "Сообщите только" #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:95 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:97 msgid "Download and verify only" -msgstr "" +msgstr "Скачать и проверить только" #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:101 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:103 msgid "Download, verify, and restart" -msgstr "" +msgstr "Скачать, проверки и перезапуск" #: ../java/src/net/i2p/router/web/GraphHelper.java:107 msgid "Configure Graph Display" -msgstr "" +msgstr "Конфигурация Диаграмм Дисплея" #: ../java/src/net/i2p/router/web/GraphHelper.java:107 msgid "Select Stats" -msgstr "" +msgstr "Выберите статистику" #: ../java/src/net/i2p/router/web/GraphHelper.java:109 msgid "Periods" -msgstr "" +msgstr "Периоды" #: ../java/src/net/i2p/router/web/GraphHelper.java:110 msgid "Plot averages" -msgstr "" +msgstr "Среднее значение диаграммы" #: ../java/src/net/i2p/router/web/GraphHelper.java:111 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:405 @@ -1799,121 +1803,121 @@ msgstr "или" #: ../java/src/net/i2p/router/web/GraphHelper.java:111 msgid "plot events" -msgstr "" +msgstr "показания диаграммы" #: ../java/src/net/i2p/router/web/GraphHelper.java:112 msgid "Image sizes" -msgstr "" +msgstr "Размеры изображения" #: ../java/src/net/i2p/router/web/GraphHelper.java:112 msgid "width" -msgstr "" +msgstr "ширина" #: ../java/src/net/i2p/router/web/GraphHelper.java:113 msgid "height" -msgstr "" +msgstr "высота" #: ../java/src/net/i2p/router/web/GraphHelper.java:113 #: ../java/src/net/i2p/router/web/GraphHelper.java:114 msgid "pixels" -msgstr "" +msgstr "пиксели" #: ../java/src/net/i2p/router/web/GraphHelper.java:115 msgid "Refresh delay" -msgstr "" +msgstr "Задержка обновления" #: ../java/src/net/i2p/router/web/GraphHelper.java:115 msgid "hour" -msgstr "" +msgstr "час" #: ../java/src/net/i2p/router/web/GraphHelper.java:115 msgid "minute" -msgstr "" +msgstr "минута" #: ../java/src/net/i2p/router/web/GraphHelper.java:115 msgid "minutes" -msgstr "" +msgstr "минуты" #: ../java/src/net/i2p/router/web/GraphHelper.java:116 msgid "Redraw" -msgstr "" +msgstr "Перерисовать" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:59 msgid "Network Database RouterInfo Lookup" -msgstr "" +msgstr "Поиск Информации о Маршрутизаторе Базы Данных Сети" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:74 msgid "Router" -msgstr "" +msgstr "Маршрутизатор" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:74 msgid "not found in network database" -msgstr "" +msgstr "не найдено в сети баз данных" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:82 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:134 msgid "Network Database Contents" -msgstr "" +msgstr "База Данных Содержание" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:83 msgid "View RouterInfo" -msgstr "" +msgstr "Открыть Маршрутизатор Информация" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:84 msgid "LeaseSets" -msgstr "" +msgstr "АрендаНаборы" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:92 msgid "LeaseSet" -msgstr "" +msgstr "АрендаНаборы" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:94 msgid "Local" -msgstr "" +msgstr "Локальный" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 msgid "Unpublished" -msgstr "" +msgstr "Неопубликованные" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:97 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:104 msgid "Destination" -msgstr "" +msgstr "Направление" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:114 #, java-format msgid "Expires in {0}" -msgstr "" +msgstr "Срок истекает в {0}" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:116 #, java-format msgid "Expired {0} ago" -msgstr "" +msgstr "Истек {0} назад" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:118 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:156 msgid "Gateway" -msgstr "" +msgstr "Шлюз" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:118 msgid "Lease" -msgstr "" +msgstr "Аренда" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:120 msgid "Tunnel" -msgstr "" +msgstr "Туннель" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:134 msgid "View LeaseSets" -msgstr "" +msgstr "Смотреть на Аренду-Наборы" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:136 msgid "Not initialized" -msgstr "" +msgstr "Не инициализируется" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:145 msgid "Routers" -msgstr "" +msgstr "Маршрутизаторы" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:147 msgid "Show all routers" @@ -1921,17 +1925,17 @@ msgstr "Показать все маршрутизаторы" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:149 msgid "Show all routers with full stats" -msgstr "" +msgstr "Показать все маршрутизаторы с полной статистики" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:184 msgid "Network Database Router Statistics" -msgstr "" +msgstr "Сетевая База Данных Статистики Маршрутизатора" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:204 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:222 msgid "Count" -msgstr "" +msgstr "Количество" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 @@ -1940,23 +1944,23 @@ msgstr "Версия" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:204 msgid "Transports" -msgstr "" +msgstr "Транспортные" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:222 msgid "Country" -msgstr "" +msgstr "Страна" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:254 msgid "Our info" -msgstr "" +msgstr "Наша информация" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:256 msgid "Peer info for" -msgstr "" +msgstr "Информация о пире" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:260 msgid "Full entry" -msgstr "" +msgstr "Полная запись" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:266 #: ../java/src/net/i2p/router/web/SummaryHelper.java:96 @@ -1966,22 +1970,22 @@ msgstr "Скрыто" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:266 msgid "Updated" -msgstr "" +msgstr "Обновлено" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:267 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:270 #, java-format msgid "{0} ago" -msgstr "" +msgstr "{0} назад" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:269 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:273 msgid "Published" -msgstr "" +msgstr "Опубликован" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:275 msgid "Address(es)" -msgstr "" +msgstr "Адреса" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:308 msgid "Hidden or starting up" @@ -1989,33 +1993,33 @@ msgstr "Скрытая или запуском" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:308 msgid "SSU" -msgstr "" +msgstr "SSU" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:308 msgid "SSU with introducers" -msgstr "" +msgstr "SSU с поручителями" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:309 msgid "NTCP" -msgstr "" +msgstr "NTCP" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:309 msgid "NTCP and SSU" -msgstr "" +msgstr "NTCP и SSU" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:309 msgid "NTCP and SSU with introducers" -msgstr "" +msgstr "NTCP и SSU с поручителями" #: ../java/src/net/i2p/router/web/NewsFetcher.java:80 #, java-format msgid "News last updated {0} ago." -msgstr "" +msgstr "Новости Последнее обновление {0} назад." #: ../java/src/net/i2p/router/web/NewsFetcher.java:86 #, java-format msgid "News last checked {0} ago." -msgstr "" +msgstr "Новости Последняя проверка: {0} назад." #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:72 msgid "Peer Profiles" @@ -2024,21 +2028,21 @@ msgstr "Профили Пиров" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:73 #, java-format msgid "Showing {0} recent profiles." -msgstr "" +msgstr "Показаны {0} последних профилей." #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:75 #, java-format msgid "Hiding {0} older profiles." -msgstr "" +msgstr "Сокрытие {0} взрослыми профилей." #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:77 #, java-format msgid "Hiding {0} standard profiles." -msgstr "" +msgstr "Сокрытие {0} стандартных профилей." #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:82 msgid "Groups (Caps)" -msgstr "" +msgstr "Группы (Способности)" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:83 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:251 @@ -2055,11 +2059,11 @@ msgstr "Способность" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:85 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:255 msgid "Integration" -msgstr "" +msgstr "Интеграция" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:86 msgid "Status" -msgstr "" +msgstr "Статус" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:126 msgid "Fast, High Capacity" @@ -2071,12 +2075,12 @@ msgstr "Высокая производительная мощность" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:128 msgid "Standard" -msgstr "" +msgstr "Стандартный" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:129 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:163 msgid "Failing" -msgstr "" +msgstr "В противном случае" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:249 @@ -2085,15 +2089,15 @@ msgstr "Интегрированные" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:162 msgid "Banned" -msgstr "" +msgstr "Запрещена" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:164 msgid "Unreachable" -msgstr "" +msgstr "Недоступные" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:171 msgid "Test Fails" -msgstr "" +msgstr "Test Failures" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:175 msgid "profile" @@ -2105,67 +2109,67 @@ msgstr "Floodfill и Интегрированные Пиры" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:188 msgid "Caps" -msgstr "" +msgstr "Предельные" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:189 msgid "Integ. Value" -msgstr "" +msgstr "Интегрированное значение" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:190 msgid "Last Heard About" -msgstr "" +msgstr "Последний Слышали О" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:191 msgid "Last Heard From" -msgstr "" +msgstr "Последний Раз Слышали От" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:192 msgid "Last Good Send" -msgstr "" +msgstr "Последний Хорошо Отправить" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:193 msgid "Last Bad Send" -msgstr "" +msgstr "Последний Плохо Отправить" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:194 msgid "10m Resp. Time" -msgstr "" +msgstr "10 мин. Время отклика" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:195 msgid "1h Resp. Time" -msgstr "" +msgstr "1 час Время отклика" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:196 msgid "1d Resp. Time" -msgstr "" +msgstr "1 день Время отклика" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:197 msgid "Last Good Lookup" -msgstr "" +msgstr "Последний Хороший Поиск" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:198 msgid "Last Bad Lookup" -msgstr "" +msgstr "Последний Плохо Поиска" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:199 msgid "Last Good Store" -msgstr "" +msgstr "Последний Хорошо Хранения" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200 msgid "Last Bad Store" -msgstr "" +msgstr "Последний Плохо Хранения" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:201 msgid "1h Fail Rate" -msgstr "" +msgstr "1ч Интенсивность Отказов" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202 msgid "1d Fail Rate" -msgstr "" +msgstr "1д Интенсивность Отказов" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:250 msgid "Thresholds" -msgstr "" +msgstr "Порог" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:252 msgid "fast peers" @@ -2181,64 +2185,64 @@ msgstr "хорошо интегрированные пиры" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:257 msgid "Definitions" -msgstr "" +msgstr "Определение" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:258 msgid "as determined by the profile organizer" -msgstr "" +msgstr "как определяется профилем организатор" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:258 msgid "groups" -msgstr "" +msgstr "группы" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "capabilities in the netDb, not used to determine profiles" -msgstr "" +msgstr "возможности в сетьБД, не используются для определения профилей" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "caps" -msgstr "" +msgstr "пределы" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 msgid "peak throughput (bytes per second) over a 1 minute period that the peer has sustained in a single tunnel" -msgstr "" +msgstr "Пик производительности (байт в секунду) в течение 1 минуты периода, что партнер имеет выдержанный в одном туннеле" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 msgid "speed" -msgstr "" +msgstr "скорость" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "capacity" -msgstr "" +msgstr "потенциала" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "how many tunnels can we ask them to join in an hour?" -msgstr "" +msgstr "cколько туннелей мы можем попросить их присоединиться к часу?" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 msgid "how many new peers have they told us about lately?" -msgstr "" +msgstr "сколько новых узлов не нам сказали последнее время?" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 msgid "integration" -msgstr "" +msgstr "интеграция" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "is the peer banned, or unreachable, or failing tunnel tests?" -msgstr "" +msgstr "это совокупность запрещены или недоступны, или не туннель тесты?" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "status" -msgstr "" +msgstr "статус" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:321 msgid "n/a" -msgstr "" +msgstr "не доступно" #: ../java/src/net/i2p/router/web/ShitlistRenderer.java:57 #, java-format msgid "Temporary ban expiring in {0}" -msgstr "" +msgstr "Временного запрета истекает в {0}" #: ../java/src/net/i2p/router/web/ShitlistRenderer.java:59 #, java-format @@ -2247,19 +2251,19 @@ msgstr "Запрещены до перезагрузку через {0}" #: ../java/src/net/i2p/router/web/ShitlistRenderer.java:71 msgid "unban now" -msgstr "" +msgstr "удалить запрета сейчас" #: ../java/src/net/i2p/router/web/StatsGenerator.java:58 msgid "Statistics gathered during this router's uptime" -msgstr "" +msgstr "Статистические данные, полученные во время проведенное на сайте этого маршрутизатора" #: ../java/src/net/i2p/router/web/StatsGenerator.java:61 msgid "The data gathered is quantized over a 1 minute period, so should just be used as an estimate." -msgstr "" +msgstr "Данные собраны квантуется более 1 минуты периода, поэтому следует использовать в качестве оценки." #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:40 msgid "Configure startup of clients and webapps (services); manually start dormant services" -msgstr "" +msgstr "Настройка запуска клиентов и Webapps (услуг); вручную запустить покоя услуги" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:42 msgid "I2P Services" @@ -2267,7 +2271,7 @@ msgstr "Сервисы I2P" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:48 msgid "Manage your I2P hosts file here (I2P domain name resolution)" -msgstr "" +msgstr "Управляйте своими I2P хостов файла здесь (I2P доменных имен)" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:50 msgid "Addressbook" @@ -2275,7 +2279,7 @@ msgstr "Адресная Книжка" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:54 msgid "Built-in anonymous BitTorrent Client" -msgstr "" +msgstr "Встроенные в анонимной загрузки клиента" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:56 msgid "Torrents" @@ -2291,7 +2295,7 @@ msgstr "Веб-Почта" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:66 msgid "Anonymous resident webserver" -msgstr "" +msgstr "Аноним сервер резидента" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:68 msgid "Webserver" @@ -2299,7 +2303,7 @@ msgstr "Веб-Сервер" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:72 msgid "Configure I2P Router" -msgstr "" +msgstr "Настройка Маршрутизатора I2P" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:74 msgid "I2P Internals" @@ -2308,16 +2312,16 @@ msgstr "Внутренняя Организация I2P" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:80 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:344 msgid "View existing tunnels and tunnel build status" -msgstr "" +msgstr "Просмотр существующих туннелей и туннелей построить статус" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:86 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Show all current peer connections" -msgstr "" +msgstr "Показать все текущие подключения сверстников" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:92 msgid "Show recent peer performance profiles" -msgstr "" +msgstr "Показать последних профили производительности сверстников" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:94 msgid "Profiles" @@ -2325,7 +2329,7 @@ msgstr "Профили" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:98 msgid "Show list of all known I2P routers" -msgstr "" +msgstr "Показать список всех известных I2P маршрутизаторы" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:100 msgid "NetDB" @@ -2333,7 +2337,7 @@ msgstr "СетьДБ" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:104 msgid "Health Report" -msgstr "" +msgstr "Доклад о Состоянии Здравоохранения" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:106 msgid "Logs" @@ -2341,7 +2345,7 @@ msgstr "Логи" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:110 msgid "Show the router's workload, and how it's performing" -msgstr "" +msgstr "Показать нагрузку на маршрутизатор, и как это исполняющей" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:112 msgid "Jobs" @@ -2349,7 +2353,7 @@ msgstr "Задачи" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:116 msgid "Graph router performance" -msgstr "" +msgstr "График производительности маршрутизатора" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:118 msgid "Graphs" @@ -2357,11 +2361,11 @@ msgstr "Диаграммы" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 msgid "Textual router performance statistics" -msgstr "" +msgstr "Текстовое маршрутизатора статистики по эффективности" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:134 msgid "I2P Router Help" -msgstr "" +msgstr "I2P Помощь Маршрутизатор" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:136 msgid "General" @@ -2369,11 +2373,11 @@ msgstr "Общий" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Your unique I2P router identity is" -msgstr "" +msgstr "Ваш уникальный I2P маршрутизатора идентичность" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:143 msgid "never reveal it to anyone" -msgstr "" +msgstr "никогда не показывайте его никому" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Local Identity" @@ -2381,7 +2385,7 @@ msgstr "Локальный Адрес" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "How long we've been running for this session" -msgstr "" +msgstr "Как долго мы уже в течение этой сессии" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160 msgid "Uptime" @@ -2389,15 +2393,15 @@ msgstr "Аптайм" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:167 msgid "Help with configuring your firewall and router for optimal I2P performance" -msgstr "" +msgstr "Помощь в настройке брандмауэра и маршрутизатора для обеспечения оптимальной производительности I2P" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194 msgid "Download" -msgstr "" +msgstr "Загрузка" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Download Unsigned" -msgstr "" +msgstr "Загрузка Неподписанных" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Active" @@ -2417,23 +2421,23 @@ msgstr "Общепризнанные" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 msgid "Help with firewall configuration" -msgstr "" +msgstr "Помощь в настройке брандмауэра" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:272 msgid "Check NAT/firewall" -msgstr "" +msgstr "Проверка NAT/брандмауэры" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292 msgid "Reseed" -msgstr "" +msgstr "Повтор Первой Сети Связи" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 msgid "Configure router bandwidth allocation" -msgstr "" +msgstr "Настройка маршрутизатора распределения пропускной способностью" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "Bandwidth in/out" -msgstr "Пропускная способность входящего/выходящего" +msgstr "Пропускная способность входящего / выходящего" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Total" @@ -2441,11 +2445,11 @@ msgstr "Всего" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:336 msgid "Used" -msgstr "Использовано" +msgstr "Колич." #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 msgid "Tunnels in/out" -msgstr "Туннели входящие/выходящие " +msgstr "Туннели входящие / выходящие " #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Exploratory" @@ -2457,7 +2461,7 @@ msgstr "Участвующие" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 msgid "What's in the router's job queue?" -msgstr "" +msgstr "Что в очереди заданий маршрутизатор?" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:375 msgid "Congestion" @@ -2485,7 +2489,7 @@ msgstr "отклонение" #: ../java/src/net/i2p/router/web/SummaryHelper.java:92 msgid "ERR-Client Manager I2CP Error - check logs" -msgstr "" +msgstr "ОШИБКА-менеджер клиентов I2CP ошибка - проверьте журналы" #: ../java/src/net/i2p/router/web/SummaryHelper.java:94 msgid "ERR-ClockSkew" @@ -2498,23 +2502,23 @@ msgstr "ОК" #: ../java/src/net/i2p/router/web/SummaryHelper.java:104 msgid "ERR-Private TCP Address" -msgstr "" +msgstr "ОШИБКА Частные TCP-адрес" #: ../java/src/net/i2p/router/web/SummaryHelper.java:106 msgid "ERR-SymmetricNAT" -msgstr "" +msgstr "ОШИБКА - Симметричный-NAT" #: ../java/src/net/i2p/router/web/SummaryHelper.java:109 msgid "WARN-Firewalled with Inbound TCP Enabled" -msgstr "" +msgstr "ПРЕДУПРЕЖДЕНИЕ-файрвол с Входящий TCP Включено" #: ../java/src/net/i2p/router/web/SummaryHelper.java:111 msgid "WARN-Firewalled and Floodfill" -msgstr "" +msgstr "ПРЕДУПРЕЖДЕНИЕ-файрволл и Floodfill" #: ../java/src/net/i2p/router/web/SummaryHelper.java:113 msgid "WARN-Firewalled and Fast" -msgstr "" +msgstr "ПРЕДУПРЕЖДЕНИЕ-файрволл и быстро" #: ../java/src/net/i2p/router/web/SummaryHelper.java:114 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:561 @@ -2523,15 +2527,15 @@ msgstr "За Брандмауэром" #: ../java/src/net/i2p/router/web/SummaryHelper.java:116 msgid "ERR-UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and restart" -msgstr "" +msgstr "ОШИБКА UDP-порта в использовании - Задать i2np.udp.internalPort=xxxx Расширенный конфигурации и перезапустить" #: ../java/src/net/i2p/router/web/SummaryHelper.java:123 msgid "ERR-UDP Disabled and Inbound TCP host/port not set" -msgstr "" +msgstr "ERROR-UDP Disabled and Inbound TCP host/port not set" #: ../java/src/net/i2p/router/web/SummaryHelper.java:125 msgid "WARN-Firewalled with UDP Disabled" -msgstr "" +msgstr "ПРЕДУПРЕЖДЕНИЕ-файрвол с UDP для инвалидов" #: ../java/src/net/i2p/router/web/SummaryHelper.java:127 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:577 @@ -2540,7 +2544,7 @@ msgstr "Проверка" #: ../java/src/net/i2p/router/web/SummaryHelper.java:360 msgid "Add/remove/edit & control your client and server tunnels" -msgstr "" +msgstr "Добавлять / удалять / редактировать и управлять вашим клиентом и сервером туннелей" #: ../java/src/net/i2p/router/web/SummaryHelper.java:360 msgid "Local Destinations" @@ -2548,41 +2552,41 @@ msgstr "Локальные Пункты Назначения" #: ../java/src/net/i2p/router/web/SummaryHelper.java:369 msgid "Server" -msgstr "" +msgstr "Сервер" #: ../java/src/net/i2p/router/web/SummaryHelper.java:373 msgid "Show tunnels" -msgstr "" +msgstr "Показать туннелей" #: ../java/src/net/i2p/router/web/SummaryHelper.java:384 msgid "Leases expired" -msgstr "" +msgstr "Срока аренды" #: ../java/src/net/i2p/router/web/SummaryHelper.java:384 #: ../java/src/net/i2p/router/web/SummaryHelper.java:385 msgid "Rebuilding" -msgstr "" +msgstr "Восстановление" #: ../java/src/net/i2p/router/web/SummaryHelper.java:385 msgid "ago" -msgstr "" +msgstr "назад" #: ../java/src/net/i2p/router/web/SummaryHelper.java:388 msgid "Ready" -msgstr "" +msgstr "Готовый" #: ../java/src/net/i2p/router/web/SummaryHelper.java:392 msgid "Building" -msgstr "" +msgstr "Строительство" #: ../java/src/net/i2p/router/web/SummaryHelper.java:392 msgid "Building tunnels" -msgstr "" +msgstr "Строительство туннелей" #: ../java/src/net/i2p/router/web/SummaryHelper.java:404 #: ../java/strings/Strings.java:36 msgid "shared clients" -msgstr "клиенты c расшаренной базой" +msgstr "общие клиенты" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:40 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:62 @@ -2591,7 +2595,7 @@ msgstr "конфигурировать" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:64 msgid "dead" -msgstr "" +msgstr "мертвый" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:70 msgid "Participating tunnels" @@ -2599,107 +2603,107 @@ msgstr "Участвующие туннели" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:71 msgid "From" -msgstr "" +msgstr "От" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:71 msgid "Receive on" -msgstr "" +msgstr "Получить на" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 msgid "Expiration" -msgstr "" +msgstr "Истечение срока" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 msgid "Send on" -msgstr "" +msgstr "Отправить по" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 msgid "To" -msgstr "" +msgstr "К" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:73 msgid "Rate" -msgstr "" +msgstr "Ставка" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:73 msgid "Role" -msgstr "" +msgstr "Роль" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:73 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:156 msgid "Usage" -msgstr "" +msgstr "Использование" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:107 msgid "grace period" -msgstr "" +msgstr "льготный период" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:117 msgid "Outbound Endpoint" -msgstr "" +msgstr "Исходящие Конечная точка" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:119 msgid "Inbound Gateway" -msgstr "" +msgstr "Inbound Сетевой Шлюз" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:121 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Participant" -msgstr "" +msgstr "Участник" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:126 msgid "Inactive participating tunnels" -msgstr "" +msgstr "Неактивные участвующие туннелей" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:127 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:216 msgid "Lifetime bandwidth usage" -msgstr "" +msgstr "Использование долговечной пропускной способности входящего канала" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:156 msgid "Expiry" -msgstr "" +msgstr "Истечение Срока" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:156 msgid "In/Out" -msgstr "" +msgstr "Входящего / Выходящего" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:159 msgid "Participants" -msgstr "" +msgstr "Участники" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:165 msgid "Endpoint" -msgstr "" +msgstr "Конечная Точка" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:205 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:211 msgid "Build in progress" -msgstr "" +msgstr "Опираясь на данном моменте" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:205 msgid "inbound" -msgstr "" +msgstr "входящий" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:211 msgid "outbound" -msgstr "" +msgstr "исходящий" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:215 msgid "No tunnels; waiting for the grace period to end." -msgstr "" +msgstr "Нет туннелях, ожидая льготного периода и до конца." #: ../java/src/net/i2p/router/web/TunnelRenderer.java:216 msgid "in" -msgstr "" +msgstr "входящий" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:217 msgid "out" -msgstr "" +msgstr "исходящий" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:234 msgid "Tunnel Counts By Peer" -msgstr "" +msgstr "Тоннель графов По Пиру" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:235 msgid "% of total" @@ -2707,11 +2711,11 @@ msgstr "% всего" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:235 msgid "Expl. + Client" -msgstr "" +msgstr "Разведочной + Клиентский" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:235 msgid "Part. from + to" -msgstr "" +msgstr "Participating from + to" #: ../java/strings/Strings.java:12 msgid "addressbook" @@ -2719,103 +2723,103 @@ msgstr "адресная книжка" #: ../java/strings/Strings.java:13 msgid "i2psnark" -msgstr "" +msgstr "i2psnark" #: ../java/strings/Strings.java:14 msgid "i2ptunnel" -msgstr "" +msgstr "i2p-туннель" #: ../java/strings/Strings.java:15 msgid "susimail" -msgstr "" +msgstr "susi-почта" #: ../java/strings/Strings.java:16 msgid "susidns" -msgstr "" +msgstr "susidns" #: ../java/strings/Strings.java:17 msgid "routerconsole" -msgstr "" +msgstr "маршрутизатор-консоли" #: ../java/strings/Strings.java:22 msgid "Web console" -msgstr "" +msgstr "Веб-консоль" #: ../java/strings/Strings.java:23 msgid "SAM application bridge" -msgstr "" +msgstr "Мост приложения SAM" #: ../java/strings/Strings.java:24 msgid "Application tunnels" -msgstr "" +msgstr "Применение туннелей" #: ../java/strings/Strings.java:25 msgid "My eepsite web server" -msgstr "" +msgstr "Мой веб-сервер «eepsite»" #: ../java/strings/Strings.java:26 msgid "I2P webserver (eepsite)" -msgstr "" +msgstr "Мой веб-сервер «eepsite»" #: ../java/strings/Strings.java:27 msgid "Browser launch at startup" -msgstr "" +msgstr "Запуск браузера при запуске I2P" #: ../java/strings/Strings.java:28 msgid "BOB application bridge" -msgstr "" +msgstr "Мост приложения BOB" #: ../java/strings/Strings.java:30 msgid "Open Router Console in web browser at startup" -msgstr "" +msgstr "Открыть консоль маршрутизатора в веб-браузере при запуске" #: ../java/strings/Strings.java:37 msgid "IRC proxy" -msgstr "" +msgstr "IRC прокси" #: ../java/strings/Strings.java:38 msgid "eepsite" -msgstr "" +msgstr "eepsite" #: ../java/strings/Strings.java:39 msgid "I2P webserver" -msgstr "" +msgstr "I2P web-server" #: ../java/strings/Strings.java:40 msgid "HTTP Proxy" -msgstr "" +msgstr "HTTP Прокси" #: ../java/strings/Strings.java:42 msgid "eepProxy" -msgstr "" +msgstr "eep-Прокси" #: ../java/strings/Strings.java:43 msgid "ircProxy" -msgstr "" +msgstr "irc-Прокси" #: ../java/strings/Strings.java:45 msgid "I2PSnark" -msgstr "" +msgstr "I2PSnark" #: ../java/strings/Strings.java:47 msgid "iMule" -msgstr "" +msgstr "iMule" #: ../java/strings/Strings.java:51 msgid "classic" -msgstr "" +msgstr "классическая" #: ../java/strings/Strings.java:52 msgid "dark" -msgstr "" +msgstr "темная" #: ../java/strings/Strings.java:53 msgid "light" -msgstr "" +msgstr "светлая" #: ../java/strings/Strings.java:54 msgid "midnight" -msgstr "" +msgstr "полуночная" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:106 msgid "config networking" @@ -3777,55 +3781,55 @@ msgstr "Выполняется обновление" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:314 msgid "News URL" -msgstr "" +msgstr "Новости URL" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:318 msgid "Refresh frequency" -msgstr "" +msgstr "Частота обновления" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:322 msgid "Update policy" -msgstr "" +msgstr "Обновление конфигурации" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:326 msgid "Update through the eepProxy?" -msgstr "" +msgstr "Обновление через eep-Прокси?" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:330 msgid "eepProxy host" -msgstr "" +msgstr "eep-Прокси хост" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:334 msgid "eepProxy port" -msgstr "" +msgstr "eep-Прокси порт" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:338 msgid "Update URLs" -msgstr "" +msgstr "Обновления URL-адресы" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:342 msgid "Trusted keys" -msgstr "" +msgstr "Доверенные криптографические ключи" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:346 msgid "Update with unsigned development builds?" -msgstr "" +msgstr "Обновить беззнаковой тестовой сборкой?" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:350 msgid "Unsigned Build URL" -msgstr "" +msgstr "Беззнаковая тестовая сборка URL" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:354 msgid "Save" -msgstr "" +msgstr "Сохранить" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:117 msgid "Page Not Found" -msgstr "" +msgstr "Страница Не Найдена" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:243 msgid "Sorry! You appear to be requesting a non-existent Router Console page or resource." -msgstr "" +msgstr "Извините! Вы, как представляется, с просьбой о несуществующих Маршрутизатор консоли страницы или ресурса." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:245 msgid "Error 404" @@ -3853,7 +3857,7 @@ msgstr "очереди заданий" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:227 msgid "I2P Router Job Queue" -msgstr "" +msgstr "Маршрутизатор I2P Очередь Заданий" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:105 msgid "logs" @@ -3885,7 +3889,7 @@ msgstr "связи пиров" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:227 msgid "I2P Network Peers" -msgstr "" +msgstr "I2P Сеть Пиры" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:105 msgid "peer profiles" @@ -3893,26 +3897,26 @@ msgstr "профили пиров" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:227 msgid "I2P Network Peer Profiles" -msgstr "" +msgstr "Профили Пиров Сети I2P" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:105 msgid "statistics" -msgstr "" +msgstr "статистика" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:242 msgid "I2P Router Statistics" -msgstr "" +msgstr "I2P Маршрутизатор Статистика" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:245 #, java-format msgid "Disable {0}s Refresh" -msgstr "" +msgstr "Откл. {0}с. Обновление" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:105 msgid "tunnel summary" -msgstr "" +msgstr "туннель резюме" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:227 msgid "I2P Tunnel Summary" -msgstr "" +msgstr "I2P Тоннеля Резюме" diff --git a/installer/resources/readme/readme_ru.html b/installer/resources/readme/readme_ru.html index 2ea63e941..5dc2d8ef1 100644 --- a/installer/resources/readme/readme_ru.html +++ b/installer/resources/readme/readme_ru.html @@ -7,80 +7,55 @@ Русский Svenska
      -

      Добро Пожаловать В I2P!

      -

      Если Вы только что зашли в I2P, числа слева должны - увеличиваться в течении нескольких минут; Вы увидите пункт назначения «клиентов с расшаренной базой» - (в противном случае, см. информацию ниже). Как только Вы увидите их, -Вы сможете:

      +

      Добро пожаловать в I2P!

      +

      Если Вы только что запустили I2P — в ближайшие минуты числа слева в графе «Активные» должны начать расти и в списке «Локальные Пункты Назначения» должна появиться запись «общие клиенты» (если этого не случилось — см. «устранение неполадок»). После этого Вы сможете:

        -
      • просмотреть сайты «eepsites» – на I2P существуют анонимно управляемые веб-сайты - – задайте в браузере HTTP прокси серверы 127.0.0.01, порт 4444, затем - перейдите на «eepsite».
        + +
      • Просматривать I2P-сайты (веб-сайты хостящиеся анонимно внутри I2P сети) — настройте в Вашем браузере HTTP прокси-сервер 127.0.0.1:4444, затем попробуйте зайти на эти I2P-сайты:
        +
          -
        • inproxy.tino.i2p - и perv.i2p сайты, отслеживанющие активные сайты - «eepsites»
          • -
        • forum.i2p: безопасное - и анонимное подсоединение к форуму forum.i2p2.de
          • -
        • www.i2p2.i2p и - mirror i2p-projekt.i2p: безопасное и - анонимное подсоединение к www.i2p2.de
          • -
        • eepsites.i2p: - анонимный сервер поиска сайтов «eepsites»
          • -
        • ugha.i2p: «eepsite» ugha, - вики, который может редактировать каждый пользователь, а ткаже множество ссылок
          • -
        • fproxy.tino.i2p: - Freenet прокси
          • -
        • echelon.i2p: архив - программного обеспечения и информация для I2P
          • -
        • paste.i2p2.i2p: безопасные и - анонимныелогические операции.
          • +
        • inproxy.tino.i2p и perv.i2p: автоматически обновляющиеся списки активных I2P-сайтов
          • +
        • forum.i2p: безопасное и анонимное зеркало для форума forum.i2p2.de
          • +
        • www.i2p2.i2p или i2p-projekt.i2p: безопасное и анонимное зеркало для www.i2p2.de
          • +
        • eepsites.i2p: анонимная поисковая система по I2P-сайтам
          • +
        • ugha.i2p: I2P-вики, которую может редактировать любой пользователь, а также множество ссылок
          • +
        • fproxy.tino.i2p: Freenet-прокси
          • +
        • echelon.i2p: архив программного обеспечения для I2P
          • +
        • paste.i2p2.i2p: анонимный pastebin-сервис

        - Существует также множество других сайтов «eepsites» - следуйте по указанным ссылкам, - добавьте в закладки свои любимые, и заходите на них почаще! -
        • -
          -
        • просматривать веб-страницы - HTTP «внешние прокси» I2P - подключены к Вашей программе HTTP прокси, порт 4444 – просто - настройте прокси своего браузера на такое использование и переходите на любой URL - – ваш запрос будет переадресован в I2P.
          • -
        • отправьте файлы - на Snark BitTorrent-клиенте существует интегрированный порт.
          • -
        • используйте анонимные учетные записи электронной почты - postman создал - почтовую систему, совместимую с обычными почтовыми клиентами (протоколы POP3 / SMTP), что предоставляет - пользоваться почтовыми услугами внутри I2P, а также, по интернету! Получите - учетную запись на hq.postman.i2p. Мы - объединяем почтовых клиентов Susimail, анонимных клиентов - pop3/smtp с веб-интерфейсом, сконфигурированных для получения услуг электронной почты.
          • -
        • общайтесь анонимно - активизируйте Ваш собственный интернет-чат IRC - и подключитесь к серверу 127.0.0.1, порт 6668. Это говорит о том, - что Вы находитесь на анонимном сервере IRC, но ни Вы, ни Ваш собеседник не знает, - где находятся остальные.
          • -
        • ведите блог анонимно - настройте Syndie
          • -
        • и многое другое
          • -
        + + Существует также множество других I2P-сайтов — просто начните обход с указанных выше ссылок и добавляйте в свои закладки всё что вам понравится, и возвращайтесь почаще! +
        + +
      • Анонимно просматривать обычные веб-сайты — в I2P по умолчанию настроен глобальный анонимный «внешний прокси» («Outproxy»), через который будут перенаправляться ваши запросы к http-серверам обычного интернета. (При необходимости Вы можете отключить эту функцию в свойствах i2p-туннеля «eepProxy»)
        • + +
      • Передавать файлы — для этого есть встроенный порт BitTorrent-клиента Snark.
        • + +
      • Пользоваться анонимной почтой — спасибо postman-у за создание почтовой системы hq.postman.i2p совместимой с обычными почтовыми клиентами (через протоколы POP3/SMTP). С её помощью можно обмениваться почтой как внутри I2P, так и с адресами обычного интернета. Мы также предлагаем попробовать Susimail — встроенный почтовый клиент с веб-интерфейсом, уже настроенный на работу с сервером postman-а, вам лишь остается создать аккаунт.
        • + + +
      • Общаться в анонимных чатах — запустите любой удобный для Вас IRC-клиент и подключитесь к серверу 127.0.0.1:6668. По этому адресу находится вход на два анонимно хостящихся IRC-сервера. Ваше реальное местоположение также не будет известно ни серверам, ни другим пользователям.
        • + +
      • Вести анонимный блог — попробуйте Syndie
        • + +
      • и многое другое
      -

      Хотите иметь собственный сайт «eepsite»?

      -

      Чтобы Вы могли управлять своим сайтом «eepsite» - просмотрите информацию на сервере - Jetty по адресу: - http://127.0.0.1:7658/. - Просто поместите свои файлы на eepsite/docroot/ directory - (или поместите любой стандарный JSP/Servlet .war files под - eepsite/webapps, или стандартный CGI script под - eepsite/cgi-bin) и они появятся. Как только начнется - работа туннелей, Ваш сайт смогут просматривать - другие пользователи. Детальные инструкции о том, как запустить свой сайт, - Вы можете найти на своей временной страничке сайта.

      + +

      Хотите завести собственный I2P-сайт?

      +

      Для этого в I2P есть встроенный http-сервер Jetty работающий по адресу http://127.0.0.1:7658/. + +Просто поместите свои файлы в директорию eepsite/docroot/ (.war-файлы JSP/сервлетов в директорию eepsite/webapps/, а CGI-скрипты в директорию eepsite/cgi-bin/). + +После этого достаточно запустить i2p-туннель «eepsite tunnel», указывающий на ваш сайт, и он станет доступным для других пользователей.

      + +

      Подробную пошаговую инструкцию Вы можете найти на временной страничке-заготовке Вашего сайта. +

      Поиск и устранение неполадок

      -

      Будьте терпеливы – в первый раз I2P может загружаться медленно, поскольку - будет искать пиры. Если по истечении 30 минут ограниченный/новый счет будет - иметь менее, чем 10 подсоединенных пиров, для лучшего соединения откройте порт - 8887 на Вашем брандмауере (межсетевом экране). Если Вы не видите ни одного - сайта «eepsite» (даже www.i2p2.i2p), проверьте, - подключен ли прокси браузер к 127.0.0.1, порт 4444. Вы также можете просмотреть - информацию на веб-сайте I2P, посылать - сообщения на форум I2P или зайти в чат - #i2p или #i2p в ретранслируемом Интернет-чате по адресу - irc.freenode.net, irc.postman.i2p - или irc.freshcoffee.i2p (они соединены вместе). -

      +

      Будьте терпеливы — первый старт I2P может оказаться довольно медленным из-за начального поиска пиров.

      + +

      Если по истечении 30 минут в графе «Активные» будет меньше 10 подсоединенных пиров, то для повышения качества соединения Вам следует открыть порт для I2P на Вашем файерволе или роутере (по умолчанию I2P использует порт 8887).

      + +

      Если Вы не можете соединиться ни с одним I2P-сайтом (даже www.i2p2.i2p), проверьте, включен ли в вашем браузере HTTP-прокси 127.0.0.1:4444.

      + +

      Кроме того, Вам может пригодиться справочная информация на сайте I2P. Не стесняйтесь задать интересующие вас вопросы на форуме I2P или на IRC каналах #i2p и #i2p-chat на серверах irc.freenode.net, irc.postman.i2p или irc.freshcoffee.i2p (последние два объединены в одну сеть, а на freenode работает бот-ретранслятор).

      From 23d3c33a12b08c5c9bb08c2079dfb215019b8076 Mon Sep 17 00:00:00 2001 From: echelon Date: Sun, 6 Dec 2009 11:49:43 +0000 Subject: [PATCH 038/127] Update to german console translation --- apps/routerconsole/locale/messages_de.po | 376 ++++++++++++----------- 1 file changed, 189 insertions(+), 187 deletions(-) diff --git a/apps/routerconsole/locale/messages_de.po b/apps/routerconsole/locale/messages_de.po index 9b0282c01..256093051 100644 --- a/apps/routerconsole/locale/messages_de.po +++ b/apps/routerconsole/locale/messages_de.po @@ -1240,7 +1240,7 @@ msgstr "Statusmitschnitt" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:88 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Peers" -msgstr "Kontakt" +msgstr "Kontakte" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:293 @@ -2335,512 +2335,512 @@ msgstr "Zeige alle derzeitigen Kontakt Verbindungen" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:92 msgid "Show recent peer performance profiles" -msgstr "" +msgstr "Zeige aktuelle Performanceprofile der Kontakte" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:94 msgid "Profiles" -msgstr "" +msgstr "Profile" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:98 msgid "Show list of all known I2P routers" -msgstr "" +msgstr "Zeige eine Liste aller bekannten I2P Router" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:100 msgid "NetDB" -msgstr "" +msgstr "NetzwerkDatenbank" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:104 msgid "Health Report" -msgstr "" +msgstr "Report" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:106 msgid "Logs" -msgstr "" +msgstr "Berichte" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:110 msgid "Show the router's workload, and how it's performing" -msgstr "" +msgstr "Zeige die Aktivitäten des Routers und wie performant dieser ist" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:112 msgid "Jobs" -msgstr "" +msgstr "Aufgaben" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:116 msgid "Graph router performance" -msgstr "" +msgstr "Zeichne die Routerperformance" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:118 msgid "Graphs" -msgstr "" +msgstr "Graphen" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 msgid "Textual router performance statistics" -msgstr "" +msgstr "Routerperformance Statistiken als Text" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:134 msgid "I2P Router Help" -msgstr "" +msgstr "I2P Router Hilfe" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:136 msgid "General" -msgstr "" +msgstr "Grundsätzliches" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Your unique I2P router identity is" -msgstr "" +msgstr "Deine eindeutige I2P Routeridentifikation ist" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:143 msgid "never reveal it to anyone" -msgstr "" +msgstr "Zeige diese Information niemanden!" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Local Identity" -msgstr "" +msgstr "Lokale Identifikation" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "How long we've been running for this session" -msgstr "" +msgstr "Wie lange ist der I2P Router aktiv seit letztem Neustart" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160 msgid "Uptime" -msgstr "" +msgstr "Laufzeit" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:167 msgid "" "Help with configuring your firewall and router for optimal I2P performance" -msgstr "" +msgstr "Für optimale I2P Performance solltest Du deine Firewall und den Router anpassen" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194 msgid "Download" -msgstr "" +msgstr "Download" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Download Unsigned" -msgstr "" +msgstr "Unsigniertes Paket downloaden" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Active" -msgstr "" +msgstr "Aktiv" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:237 msgid "Fast" -msgstr "" +msgstr "Schnell" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:243 msgid "High capacity" -msgstr "" +msgstr "Hohe Kapazität" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:255 msgid "Known" -msgstr "" +msgstr "Bekannt" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 msgid "Help with firewall configuration" -msgstr "" +msgstr "Hilfe mit der Firewalleinstellung" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:272 msgid "Check NAT/firewall" -msgstr "" +msgstr "Kontrolliere NAT/die Firewall" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292 msgid "Reseed" -msgstr "" +msgstr "Hole neue Kontaktinformationen" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 msgid "Configure router bandwidth allocation" -msgstr "" +msgstr "Konfiguriere die Bandbreiteneinstellungen des Routers" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "Bandwidth in/out" -msgstr "" +msgstr "Bandbreite Ein/Ausgehend" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Total" -msgstr "" +msgstr "Total" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:336 msgid "Used" -msgstr "" +msgstr "Verbraucht" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 msgid "Tunnels in/out" -msgstr "" +msgstr "Tunnels Ein/Ausgehend" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Exploratory" -msgstr "" +msgstr "Erkundungs" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 msgid "Participating" -msgstr "" +msgstr "Teilnehmende" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 msgid "What's in the router's job queue?" -msgstr "" +msgstr "Was ist in der Aufgabenliste des Routers?" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:375 msgid "Congestion" -msgstr "" +msgstr "Stau" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:380 msgid "Job lag" -msgstr "" +msgstr "Aufgabenverzögerung" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:386 msgid "Message delay" -msgstr "" +msgstr "Nachrichten sind verzögert" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:392 msgid "Tunnel lag" -msgstr "" +msgstr "Tunnelverzögerung" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:398 msgid "Backlog" -msgstr "" +msgstr "Berichte der letzten Zeit" #: ../java/src/net/i2p/router/web/SummaryHelper.java:73 msgid "skew" -msgstr "" +msgstr "Differenz" #: ../java/src/net/i2p/router/web/SummaryHelper.java:92 msgid "ERR-Client Manager I2CP Error - check logs" -msgstr "" +msgstr "FEHLER-Fehler des Klienten Managers von I2CP - siehe in den Berichten nach" #: ../java/src/net/i2p/router/web/SummaryHelper.java:94 msgid "ERR-ClockSkew" -msgstr "" +msgstr "FEHLER-Uhrzeitdifferenz" #: ../java/src/net/i2p/router/web/SummaryHelper.java:103 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:557 msgid "OK" -msgstr "" +msgstr "OK" #: ../java/src/net/i2p/router/web/SummaryHelper.java:104 msgid "ERR-Private TCP Address" -msgstr "" +msgstr "FEHLER-Private TCP Adresse" #: ../java/src/net/i2p/router/web/SummaryHelper.java:106 msgid "ERR-SymmetricNAT" -msgstr "" +msgstr "FEHLER-Symmetrisches NAT" #: ../java/src/net/i2p/router/web/SummaryHelper.java:109 msgid "WARN-Firewalled with Inbound TCP Enabled" -msgstr "" +msgstr "WARNUNG-Eingehendes TCP aktiviert aber Firewall aktiv" #: ../java/src/net/i2p/router/web/SummaryHelper.java:111 msgid "WARN-Firewalled and Floodfill" -msgstr "" +msgstr "WARNUNG-Firewall aktiv und FLoodfill aktiviert" #: ../java/src/net/i2p/router/web/SummaryHelper.java:113 msgid "WARN-Firewalled and Fast" -msgstr "" +msgstr "WARNUNG-Firewall aktiv und Schnell" #: ../java/src/net/i2p/router/web/SummaryHelper.java:114 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:561 msgid "Firewalled" -msgstr "" +msgstr "Firewall aktiv" #: ../java/src/net/i2p/router/web/SummaryHelper.java:116 msgid "" "ERR-UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and " "restart" -msgstr "" +msgstr "FEHLER-UDP Port ist belegt - setze i2np.udp.internalPort=xxxx in der Konfiguration für Profis und starte I2P neu" #: ../java/src/net/i2p/router/web/SummaryHelper.java:123 msgid "ERR-UDP Disabled and Inbound TCP host/port not set" -msgstr "" +msgstr "FEHLER-UDP deaktiviert und eingehender TCP IP/Port nicht gesetzt" #: ../java/src/net/i2p/router/web/SummaryHelper.java:125 msgid "WARN-Firewalled with UDP Disabled" -msgstr "" +msgstr "WARNUNG-Firewall aktiv und UDP deaktiviert" #: ../java/src/net/i2p/router/web/SummaryHelper.java:127 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:577 msgid "Testing" -msgstr "" +msgstr "Teste" #: ../java/src/net/i2p/router/web/SummaryHelper.java:360 msgid "Add/remove/edit & control your client and server tunnels" -msgstr "" +msgstr "Klienten und Servertunnel hinzufügen,löschen,editieren oder kontrollieren" #: ../java/src/net/i2p/router/web/SummaryHelper.java:360 msgid "Local Destinations" -msgstr "" +msgstr "Lokale Destiantionen" #: ../java/src/net/i2p/router/web/SummaryHelper.java:369 msgid "Server" -msgstr "" +msgstr "Server" #: ../java/src/net/i2p/router/web/SummaryHelper.java:373 msgid "Show tunnels" -msgstr "" +msgstr "Zeige Tunnel" #: ../java/src/net/i2p/router/web/SummaryHelper.java:384 msgid "Leases expired" -msgstr "" +msgstr "ungültige Leases" #: ../java/src/net/i2p/router/web/SummaryHelper.java:384 #: ../java/src/net/i2p/router/web/SummaryHelper.java:385 msgid "Rebuilding" -msgstr "" +msgstr "Baue neu auf" #: ../java/src/net/i2p/router/web/SummaryHelper.java:385 msgid "ago" -msgstr "" +msgstr "vorher" #: ../java/src/net/i2p/router/web/SummaryHelper.java:388 msgid "Ready" -msgstr "" +msgstr "Bereit" #: ../java/src/net/i2p/router/web/SummaryHelper.java:392 msgid "Building" -msgstr "" +msgstr "Baue auf" #: ../java/src/net/i2p/router/web/SummaryHelper.java:392 msgid "Building tunnels" -msgstr "" +msgstr "Baue Tunnel auf" #: ../java/src/net/i2p/router/web/SummaryHelper.java:404 #: ../java/strings/Strings.java:36 msgid "shared clients" -msgstr "" +msgstr "gemeinsam benutzt" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:40 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:62 msgid "configure" -msgstr "" +msgstr "ändere" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:64 msgid "dead" -msgstr "" +msgstr "gestorben" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:70 msgid "Participating tunnels" -msgstr "" +msgstr "Teilnehmende Tunnel" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:71 msgid "From" -msgstr "" +msgstr "Woher" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:71 msgid "Receive on" -msgstr "" +msgstr "Empfangen von" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 msgid "Expiration" -msgstr "" +msgstr "Zeitspanne" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 msgid "Send on" -msgstr "" +msgstr "Gesendet an" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 msgid "To" -msgstr "" +msgstr "Zu" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:73 msgid "Rate" -msgstr "" +msgstr "Rate" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:73 msgid "Role" -msgstr "" +msgstr "Aufgabe" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:73 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:156 msgid "Usage" -msgstr "" +msgstr "Benutzt" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:107 msgid "grace period" -msgstr "" +msgstr "Gnadenfrist" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:117 msgid "Outbound Endpoint" -msgstr "" +msgstr "Ausgehender Endpunkt" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:119 msgid "Inbound Gateway" -msgstr "" +msgstr "Eingehende Schnittstelle" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:121 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Participant" -msgstr "" +msgstr "Teilnehmer" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:126 msgid "Inactive participating tunnels" -msgstr "" +msgstr "Inaktive teilnehmende Tunnel" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:127 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:216 msgid "Lifetime bandwidth usage" -msgstr "" +msgstr "Verbrauchte Bandbreite über die aktive Zeit" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:156 msgid "Expiry" -msgstr "" +msgstr "Verfallzeit" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:156 msgid "In/Out" -msgstr "" +msgstr "Ein/Ausgehend" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:159 msgid "Participants" -msgstr "" +msgstr "Teilnehmer" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:165 msgid "Endpoint" -msgstr "" +msgstr "Endpunkt" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:205 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:211 msgid "Build in progress" -msgstr "" +msgstr "Aufbau in Bearbeitung" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:205 msgid "inbound" -msgstr "" +msgstr "eingehend" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:211 msgid "outbound" -msgstr "" +msgstr "ausgehend" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:215 msgid "No tunnels; waiting for the grace period to end." -msgstr "" +msgstr "Keine Tunnel; warte bie die Gnadenfrist abgelaufen ist" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:216 msgid "in" -msgstr "" +msgstr "ein" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:217 msgid "out" -msgstr "" +msgstr "aus" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:234 msgid "Tunnel Counts By Peer" -msgstr "" +msgstr "Anzahl der Tunnel nach Kontakten" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:235 msgid "% of total" -msgstr "" +msgstr "% von allen" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:235 msgid "Expl. + Client" -msgstr "" +msgstr "Erkundungs + Klienten" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:235 msgid "Part. from + to" -msgstr "" +msgstr "Teilnehmend von + zu" #: ../java/strings/Strings.java:12 msgid "addressbook" -msgstr "" +msgstr "Adressbuch" #: ../java/strings/Strings.java:13 msgid "i2psnark" -msgstr "" +msgstr "I2PSnark" #: ../java/strings/Strings.java:14 msgid "i2ptunnel" -msgstr "" +msgstr "I2Ptunnel" #: ../java/strings/Strings.java:15 msgid "susimail" -msgstr "" +msgstr "SusiMail" #: ../java/strings/Strings.java:16 msgid "susidns" -msgstr "" +msgstr "SusiDNS" #: ../java/strings/Strings.java:17 msgid "routerconsole" -msgstr "" +msgstr "Routerkonsole" #: ../java/strings/Strings.java:22 msgid "Web console" -msgstr "" +msgstr "Webkonsole" #: ../java/strings/Strings.java:23 msgid "SAM application bridge" -msgstr "" +msgstr "SAM Anwendungsanbindung" #: ../java/strings/Strings.java:24 msgid "Application tunnels" -msgstr "" +msgstr "Applikationstunnel" #: ../java/strings/Strings.java:25 msgid "My eepsite web server" -msgstr "" +msgstr "Webserver meiner Eepseite" #: ../java/strings/Strings.java:26 msgid "I2P webserver (eepsite)" -msgstr "" +msgstr "I2P Webserver (eepsite)" #: ../java/strings/Strings.java:27 msgid "Browser launch at startup" -msgstr "" +msgstr "Starte den Browser beim Starten" #: ../java/strings/Strings.java:28 msgid "BOB application bridge" -msgstr "" +msgstr "BOB Anwendungsanbindung" #: ../java/strings/Strings.java:30 msgid "Open Router Console in web browser at startup" -msgstr "" +msgstr "Zeige die Routerkonsole im Webbrowser beim Starten" #: ../java/strings/Strings.java:37 msgid "IRC proxy" -msgstr "" +msgstr "IRC Brücke" #: ../java/strings/Strings.java:38 msgid "eepsite" -msgstr "" +msgstr "Eepseite" #: ../java/strings/Strings.java:39 msgid "I2P webserver" -msgstr "" +msgstr "I2P Webserver" #: ../java/strings/Strings.java:40 msgid "HTTP Proxy" -msgstr "" +msgstr "HTTP Brücke" #: ../java/strings/Strings.java:42 msgid "eepProxy" -msgstr "" +msgstr "eepBrücke" #: ../java/strings/Strings.java:43 msgid "ircProxy" -msgstr "" +msgstr "ircBrücke" #: ../java/strings/Strings.java:45 msgid "I2PSnark" -msgstr "" +msgstr "I2PSnark" #: ../java/strings/Strings.java:47 msgid "iMule" -msgstr "" +msgstr "iMule" #: ../java/strings/Strings.java:51 msgid "classic" -msgstr "" +msgstr "klassisch" #: ../java/strings/Strings.java:52 msgid "dark" -msgstr "" +msgstr "dunkel" #: ../java/strings/Strings.java:53 msgid "light" -msgstr "" +msgstr "Licht" #: ../java/strings/Strings.java:54 msgid "midnight" -msgstr "" +msgstr "Mitternacht" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:106 msgid "config networking" -msgstr "" +msgstr "Netzwerkeinstellungen" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:217 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:218 @@ -2868,7 +2868,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:236 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:216 msgid "Refresh (s)" -msgstr "" +msgstr "Aktualisierung in {s}" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:221 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:222 @@ -2896,70 +2896,70 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:239 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:220 msgid "Enable" -msgstr "" +msgstr "Aktiviere" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:241 msgid "I2P Network Configuration" -msgstr "" +msgstr "I2P Netzwerkeinstellungen" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:297 msgid "Bandwidth limiter" -msgstr "" +msgstr "Bandbreitenlimitierer" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:299 msgid "" "I2P will work best if you configure your rates to match the speed of your " "internet connection." -msgstr "" +msgstr "I2P arbeitet am besten wenn Du diese Werte den Angaben deiner Internetanbindung anpasst" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:303 msgid "KBps In" -msgstr "" +msgstr "KBps Eingehend" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:317 msgid "KBps Out" -msgstr "" +msgstr "KBps Ausgehend" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:333 msgid "Share" -msgstr "" +msgstr "für andere zur Benutzung freigegeben" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:340 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:307 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:303 msgid "NOTE" -msgstr "" +msgstr "HINWEIS" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:342 #, java-format msgid "You have configured I2P to share only {0} KBps." -msgstr "" +msgstr "Du hast I2P angewisen nur {0} KBps mit anderen zu teilen" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:345 msgid "I2P requires at least 12KBps to enable sharing. " -msgstr "" +msgstr "I2P benötigt mindestens 12KBps um Bandbreite zu teilen" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:346 msgid "" "Please enable sharing (participating in tunnels) by configuring more " "bandwidth. " -msgstr "" +msgstr "Bitte erhöhe deine Bandbreitenwerte um Bandbreite für andere Router (in fremden Tunneln teilnehmen) freigeben zu können." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:347 msgid "" "It improves your anonymity by creating cover traffic, and helps the network." -msgstr "" +msgstr "Dieses erhöht deine Anonymität durch mehr Rauschen auf deiner Leitung und hilft dem I2P Netzwerk" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:350 #, java-format msgid "You have configured I2P to share {0} KBps." -msgstr "" +msgstr "Du gibts {0} KBps frei für andere Router" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:353 msgid "" "The higher the share bandwidth the more you improve your anonymity and help " "the network." -msgstr "" +msgstr "Je höher die Freigabe für andere Router ist, desto besser sind deine Daten in fremden versteckt und desto besser ist es für das I2P Netzwerk" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:359 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:496 @@ -2971,141 +2971,141 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:323 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:356 msgid "Cancel" -msgstr "" +msgstr "Abbruch" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:363 msgid "IP and Transport Configuration" -msgstr "" +msgstr "IP und Transport Einstellungen" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:365 msgid "The default settings will work for most people." -msgstr "" +msgstr "Die Standardeinstellungen werden für die meisten Anwender funktionieren" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:367 msgid "There is help below." -msgstr "" +msgstr "Es gibt Hilfe weiter unten" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:369 msgid "UPnP Configuration" -msgstr "" +msgstr "UPnP Einstellungen" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:373 msgid "Enable UPnP to open firewall ports" -msgstr "" +msgstr "Aktiviere UPnP um Ports in der Firewall freizuschalten" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:375 msgid "UPnP status" -msgstr "" +msgstr "UPnP Status" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:377 msgid "IP Configuration" -msgstr "" +msgstr "IP Einstellungen" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:379 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:441 msgid "Externally reachable hostname or IP address" -msgstr "" +msgstr "Extern erreichbarer Hostname oder IP Adresse" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:383 msgid "Use all auto-detect methods" -msgstr "" +msgstr "Benutze alle automatischen Modi" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:387 msgid "Disable UPnP IP address detection" -msgstr "" +msgstr "Deaktiviere UPnP IP Adressen Erkennung" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:391 msgid "Ignore local interface IP address" -msgstr "" +msgstr "Ignoriere die IP Adresse der lokalen IP Schnittstelle" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:395 msgid "Use SSU IP address detection only" -msgstr "" +msgstr "Benutze nur die SSU Adressenerkennung" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:399 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:459 msgid "Specify hostname or IP" -msgstr "" +msgstr "Gebe den Hostnamen oder die IP an" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:405 msgid "Select Interface" -msgstr "" +msgstr "Wähle die Schnittstelle aus" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:419 msgid "Hidden mode - do not publish IP" -msgstr "" +msgstr "Versteckter Modus - Publiziere nicht die IP" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:421 msgid "(prevents participating traffic)" -msgstr "" +msgstr "(verhindert Bandbreite durch teilnehmende Tunnel)" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:423 msgid "UDP Configuration:" -msgstr "" +msgstr "UDP Einstellungen:" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:425 msgid "UDP port:" -msgstr "" +msgstr "UDP Port:" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:439 msgid "TCP Configuration" -msgstr "" +msgstr "TCP Einstellungen:" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:445 msgid "Use auto-detected IP address" -msgstr "" +msgstr "Benutze automatisch ermittelte IP Adresse" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:447 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 msgid "currently" -msgstr "" +msgstr "derzeit" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:451 msgid "if we are not firewalled" -msgstr "" +msgstr "wenn keine Firewall aktiv ist" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:455 msgid "Always use auto-detected IP address (Not firewalled)" -msgstr "" +msgstr "Benutze immer automatisch ermittelte IP Adresse (keine Firewall aktiv)" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:465 msgid "Disable inbound (Firewalled)" -msgstr "" +msgstr "Deaktiviere eingehende Verbindungen (Firewall aktiv)" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:469 msgid "Completely disable" -msgstr "" +msgstr "Komplett deaktivieren" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:471 msgid "" "(select only if behind a firewall that throttles or blocks outbound TCP)" -msgstr "" +msgstr "(nur auswählen wenn du hinter einer Firewall bist, die ausgehenden TCP Verkehr sperrt oder limitiert)" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:473 msgid "Externally reachable TCP port" -msgstr "" +msgstr "Extern erreichbarer TCP Port" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:477 msgid "Use the same port configured for UDP" -msgstr "" +msgstr "Benutze den selben Port wie für UDP eingestellt" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:485 msgid "Specify Port" -msgstr "" +msgstr "Gebe den Port an" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:342 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:329 msgid "Note" -msgstr "" +msgstr "Hinweis" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:492 msgid "Changing these settings will restart your router." -msgstr "" +msgstr "Änderungen an diesen Werten wird deinen I2P Router neu starten" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:498 msgid "Configuration Help" -msgstr "" +msgstr "Konfigurationshilfe" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:500 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:549 @@ -3113,67 +3113,69 @@ msgid "" "While I2P will work fine behind most firewalls, your speeds and network " "integration will generally improve if the I2P port is forwarded for both UDP " "and TCP." -msgstr "" +msgstr "I2P wird auch hinter den meisten Firewalls funktionieren, aber deine Geschwindigkeit und deine Integration im I2P Netz werden sich erhöhen " +"wenn der I2P Port für TCP und UDP in der Firewall freigegeben und auf deinen PC weitergeleitet ist." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:502 msgid "" "If you can, please poke a hole in your firewall to allow unsolicited UDP and " "TCP packets to reach you." -msgstr "" +msgstr "Falls es Dir möglich ist, richte bitte deine Firewall so ein, das die TCP und UDP Pakete deinen PC unverändert erreichen." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:504 msgid "" "If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole " "punching with \"SSU introductions\" to relay traffic." -msgstr "" +msgstr "Falls es dir nicht möglich ist hat I2P UPnP (Universelles Plug and Play) Unterstützung und UDP Weiterleitung mit Hilfe der \"SSU Hilsfrouter\" eingebaut."" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:506 msgid "" "Most of the options above are for special situations, for example where UPnP " "does not work correctly, or a firewall not under your control is doing harm." -msgstr "" +msgstr "Die meisten der oberen Optionen sind für besondere Situationen, wenn z.B." +"UPnP nicht funktioniert oder die Firewall nicht von die geändert werden kann und Probleme bereitet." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:508 msgid "Certain firewalls such as symmetric NATs may not work well with I2P." -msgstr "" +msgstr "Bestimmte Firewalls wie auch symmetrische NATs arbeiten gegebenfalls nicht gut mit I2P zusammen." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:517 msgid "" "UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect " "the external IP address and forward ports." -msgstr "" +msgstr "UPnP kommuniziert normalerweise mit den Internet Gateway Devices (IGDs) umd die extern erreichbare IP zu ermitteln und die Ports weiterzuleiten." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:519 msgid "UPnP support is beta, and may not work for any number of reasons" -msgstr "" +msgstr "UPnP Unterstützung ist noch in der Testphase und kann aus vielen Gründen nicht funktionieren." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:521 msgid "No UPnP-compatible device present" -msgstr "" +msgstr "Kein UPnP-fähiges Gerät gefunden" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:523 msgid "UPnP disabled on the device" -msgstr "" +msgstr "UPnP ist für dieses Gerät deaktiviert" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:525 msgid "Software firewall interference with UPnP" -msgstr "" +msgstr "Software Firewall stört UPnP" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:527 msgid "Bugs in the device's UPnP implementation" -msgstr "" +msgstr "Fehler in der UPnP Integration im Gerät" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:529 msgid "Multiple firewall/routers in the internet connection path" -msgstr "" +msgstr "Mehrere Firewalls/Router in der Verbindung zum Internet" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:531 msgid "UPnP device change, reset, or address change" -msgstr "" +msgstr "UPnP Gerät ändert sich, wird neu gestartet oder änder die Adresse" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:533 msgid "Review the UPnP status here." -msgstr "" +msgstr "Betrachte hier den UPnP Status." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:535 msgid "" From e1a88c94263f206126deb81f33e387570b2b4cd5 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 6 Dec 2009 15:07:03 +0000 Subject: [PATCH 039/127] drop 6 unused classes --- .../net/i2p/data/i2np/EndPointPrivateKey.java | 64 ------------- .../net/i2p/data/i2np/EndPointPublicKey.java | 64 ------------- .../net/i2p/data/i2np/TunnelSessionKey.java | 64 ------------- .../data/i2np/TunnelSigningPrivateKey.java | 65 ------------- .../i2p/data/i2np/TunnelSigningPublicKey.java | 64 ------------- .../i2np/TunnelVerificationStructure.java | 91 ------------------- 6 files changed, 412 deletions(-) delete mode 100644 router/java/src/net/i2p/data/i2np/EndPointPrivateKey.java delete mode 100644 router/java/src/net/i2p/data/i2np/EndPointPublicKey.java delete mode 100644 router/java/src/net/i2p/data/i2np/TunnelSessionKey.java delete mode 100644 router/java/src/net/i2p/data/i2np/TunnelSigningPrivateKey.java delete mode 100644 router/java/src/net/i2p/data/i2np/TunnelSigningPublicKey.java delete mode 100644 router/java/src/net/i2p/data/i2np/TunnelVerificationStructure.java diff --git a/router/java/src/net/i2p/data/i2np/EndPointPrivateKey.java b/router/java/src/net/i2p/data/i2np/EndPointPrivateKey.java deleted file mode 100644 index 4b3f919c8..000000000 --- a/router/java/src/net/i2p/data/i2np/EndPointPrivateKey.java +++ /dev/null @@ -1,64 +0,0 @@ -package net.i2p.data.i2np; -/* - * free (adj.): unencumbered; not under the control of others - * Written by jrandom in 2003 and released into the public domain - * with no warranty of any kind, either expressed or implied. - * It probably won't make your computer catch on fire, or eat - * your children, but it might. Use at your own risk. - * - */ - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -import net.i2p.data.DataFormatException; -import net.i2p.data.DataHelper; -import net.i2p.data.DataStructureImpl; -import net.i2p.data.PrivateKey; -import net.i2p.util.Log; - -/** - * Contains the private key which matches the EndPointPublicKey which, in turn, - * is published on the LeaseSet and used to encrypt messages to the router to - * which a Destination is currently connected. - * - * @author jrandom - */ -public class EndPointPrivateKey extends DataStructureImpl { - private final static Log _log = new Log(EndPointPrivateKey.class); - private PrivateKey _key; - - public EndPointPrivateKey() { setKey(null); } - - public PrivateKey getKey() { return _key; } - public void setKey(PrivateKey key) { _key= key; } - - public void readBytes(InputStream in) throws DataFormatException, IOException { - _key = new PrivateKey(); - _key.readBytes(in); - } - - public void writeBytes(OutputStream out) throws DataFormatException, IOException { - if (_key == null) throw new DataFormatException("Invalid key"); - _key.writeBytes(out); - } - - @Override - public boolean equals(Object obj) { - if ( (obj == null) || !(obj instanceof EndPointPublicKey)) - return false; - return DataHelper.eq(getKey(), ((EndPointPublicKey)obj).getKey()); - } - - @Override - public int hashCode() { - if (_key == null) return 0; - return getKey().hashCode(); - } - - @Override - public String toString() { - return "[EndPointPrivateKey: " + getKey() + "]"; - } -} diff --git a/router/java/src/net/i2p/data/i2np/EndPointPublicKey.java b/router/java/src/net/i2p/data/i2np/EndPointPublicKey.java deleted file mode 100644 index a366bf73b..000000000 --- a/router/java/src/net/i2p/data/i2np/EndPointPublicKey.java +++ /dev/null @@ -1,64 +0,0 @@ -package net.i2p.data.i2np; -/* - * free (adj.): unencumbered; not under the control of others - * Written by jrandom in 2003 and released into the public domain - * with no warranty of any kind, either expressed or implied. - * It probably won't make your computer catch on fire, or eat - * your children, but it might. Use at your own risk. - * - */ - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -import net.i2p.data.DataFormatException; -import net.i2p.data.DataHelper; -import net.i2p.data.DataStructureImpl; -import net.i2p.data.PublicKey; -import net.i2p.util.Log; - -/** - * Contains the public key which matches the EndPointPrivateKey. This is - * published on the LeaseSet and used to encrypt messages to the router to - * which a Destination is currently connected. - * - * @author jrandom - */ -public class EndPointPublicKey extends DataStructureImpl { - private final static Log _log = new Log(EndPointPublicKey.class); - private PublicKey _key; - - public EndPointPublicKey() { setKey(null); } - - public PublicKey getKey() { return _key; } - public void setKey(PublicKey key) { _key= key; } - - public void readBytes(InputStream in) throws DataFormatException, IOException { - _key = new PublicKey(); - _key.readBytes(in); - } - - public void writeBytes(OutputStream out) throws DataFormatException, IOException { - if (_key == null) throw new DataFormatException("Invalid key"); - _key.writeBytes(out); - } - - @Override - public boolean equals(Object obj) { - if ( (obj == null) || !(obj instanceof EndPointPublicKey)) - return false; - return DataHelper.eq(getKey(), ((EndPointPublicKey)obj).getKey()); - } - - @Override - public int hashCode() { - if (_key == null) return 0; - return getKey().hashCode(); - } - - @Override - public String toString() { - return "[EndPointPublicKey: " + getKey() + "]"; - } -} diff --git a/router/java/src/net/i2p/data/i2np/TunnelSessionKey.java b/router/java/src/net/i2p/data/i2np/TunnelSessionKey.java deleted file mode 100644 index c4effc303..000000000 --- a/router/java/src/net/i2p/data/i2np/TunnelSessionKey.java +++ /dev/null @@ -1,64 +0,0 @@ -package net.i2p.data.i2np; -/* - * free (adj.): unencumbered; not under the control of others - * Written by jrandom in 2003 and released into the public domain - * with no warranty of any kind, either expressed or implied. - * It probably won't make your computer catch on fire, or eat - * your children, but it might. Use at your own risk. - * - */ - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -import net.i2p.data.DataFormatException; -import net.i2p.data.DataHelper; -import net.i2p.data.DataStructureImpl; -import net.i2p.data.SessionKey; -import net.i2p.util.Log; - -/** - * Contains the session key used by the tunnel gateway to encrypt the DeliveryInstructions - * and used by the tunnel end point to decrypt those instructions. - * - * @author jrandom - */ -public class TunnelSessionKey extends DataStructureImpl { - private final static Log _log = new Log(TunnelSessionKey.class); - private SessionKey _key; - - public TunnelSessionKey() { this(null); } - public TunnelSessionKey(SessionKey key) { setKey(key); } - - public SessionKey getKey() { return _key; } - public void setKey(SessionKey key) { _key= key; } - - public void readBytes(InputStream in) throws DataFormatException, IOException { - _key = new SessionKey(); - _key.readBytes(in); - } - - public void writeBytes(OutputStream out) throws DataFormatException, IOException { - if (_key == null) throw new DataFormatException("Invalid key"); - _key.writeBytes(out); - } - - @Override - public boolean equals(Object obj) { - if ( (obj == null) || !(obj instanceof TunnelSessionKey)) - return false; - return DataHelper.eq(getKey(), ((TunnelSessionKey)obj).getKey()); - } - - @Override - public int hashCode() { - if (_key == null) return 0; - return getKey().hashCode(); - } - - @Override - public String toString() { - return "[TunnelSessionKey: " + getKey() + "]"; - } -} diff --git a/router/java/src/net/i2p/data/i2np/TunnelSigningPrivateKey.java b/router/java/src/net/i2p/data/i2np/TunnelSigningPrivateKey.java deleted file mode 100644 index 03d017915..000000000 --- a/router/java/src/net/i2p/data/i2np/TunnelSigningPrivateKey.java +++ /dev/null @@ -1,65 +0,0 @@ -package net.i2p.data.i2np; -/* - * free (adj.): unencumbered; not under the control of others - * Written by jrandom in 2003 and released into the public domain - * with no warranty of any kind, either expressed or implied. - * It probably won't make your computer catch on fire, or eat - * your children, but it might. Use at your own risk. - * - */ - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -import net.i2p.data.DataFormatException; -import net.i2p.data.DataHelper; -import net.i2p.data.DataStructureImpl; -import net.i2p.data.SigningPrivateKey; -import net.i2p.util.Log; - -/** - * Contains the private key which constructs a signature for the TunnelMessage - * which every participant in a tunnel uses to verify the - * TunnelVerificationStructure with. - * - * @author jrandom - */ -public class TunnelSigningPrivateKey extends DataStructureImpl { - private final static Log _log = new Log(EndPointPrivateKey.class); - private SigningPrivateKey _key; - - public TunnelSigningPrivateKey() { this(null); } - public TunnelSigningPrivateKey(SigningPrivateKey key) { setKey(key); } - - public SigningPrivateKey getKey() { return _key; } - public void setKey(SigningPrivateKey key) { _key= key; } - - public void readBytes(InputStream in) throws DataFormatException, IOException { - _key = new SigningPrivateKey(); - _key.readBytes(in); - } - - public void writeBytes(OutputStream out) throws DataFormatException, IOException { - if (_key == null) throw new DataFormatException("Invalid key"); - _key.writeBytes(out); - } - - @Override - public boolean equals(Object obj) { - if ( (obj == null) || !(obj instanceof TunnelSigningPrivateKey)) - return false; - return DataHelper.eq(getKey(), ((TunnelSigningPrivateKey)obj).getKey()); - } - - @Override - public int hashCode() { - if (_key == null) return 0; - return getKey().hashCode(); - } - - @Override - public String toString() { - return "[EndPointPrivateKey: " + getKey() + "]"; - } -} diff --git a/router/java/src/net/i2p/data/i2np/TunnelSigningPublicKey.java b/router/java/src/net/i2p/data/i2np/TunnelSigningPublicKey.java deleted file mode 100644 index 1f3530949..000000000 --- a/router/java/src/net/i2p/data/i2np/TunnelSigningPublicKey.java +++ /dev/null @@ -1,64 +0,0 @@ -package net.i2p.data.i2np; -/* - * free (adj.): unencumbered; not under the control of others - * Written by jrandom in 2003 and released into the public domain - * with no warranty of any kind, either expressed or implied. - * It probably won't make your computer catch on fire, or eat - * your children, but it might. Use at your own risk. - * - */ - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -import net.i2p.data.DataFormatException; -import net.i2p.data.DataHelper; -import net.i2p.data.DataStructureImpl; -import net.i2p.data.SigningPublicKey; -import net.i2p.util.Log; - -/** - * Contains the public key which every participant in a tunnel uses to verify - * the TunnelVerificationStructure for TunnelMessages that pass by. - * - * @author jrandom - */ -public class TunnelSigningPublicKey extends DataStructureImpl { - private final static Log _log = new Log(TunnelSigningPublicKey.class); - private SigningPublicKey _key; - - public TunnelSigningPublicKey() { this(null); } - public TunnelSigningPublicKey(SigningPublicKey key) { setKey(key); } - - public SigningPublicKey getKey() { return _key; } - public void setKey(SigningPublicKey key) { _key= key; } - - public void readBytes(InputStream in) throws DataFormatException, IOException { - _key = new SigningPublicKey(); - _key.readBytes(in); - } - - public void writeBytes(OutputStream out) throws DataFormatException, IOException { - if (_key == null) throw new DataFormatException("Invalid key"); - _key.writeBytes(out); - } - - @Override - public boolean equals(Object obj) { - if ( (obj == null) || !(obj instanceof TunnelSigningPublicKey)) - return false; - return DataHelper.eq(getKey(), ((TunnelSigningPublicKey)obj).getKey()); - } - - @Override - public int hashCode() { - if (_key == null) return 0; - return getKey().hashCode(); - } - - @Override - public String toString() { - return "[TunnelSigningPublicKey: " + getKey() + "]"; - } -} diff --git a/router/java/src/net/i2p/data/i2np/TunnelVerificationStructure.java b/router/java/src/net/i2p/data/i2np/TunnelVerificationStructure.java deleted file mode 100644 index 7c2e4f001..000000000 --- a/router/java/src/net/i2p/data/i2np/TunnelVerificationStructure.java +++ /dev/null @@ -1,91 +0,0 @@ -package net.i2p.data.i2np; -/* - * free (adj.): unencumbered; not under the control of others - * Written by jrandom in 2003 and released into the public domain - * with no warranty of any kind, either expressed or implied. - * It probably won't make your computer catch on fire, or eat - * your children, but it might. Use at your own risk. - * - */ - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -import net.i2p.data.DataFormatException; -import net.i2p.data.DataHelper; -import net.i2p.data.DataStructureImpl; -import net.i2p.data.Hash; -import net.i2p.data.Signature; -import net.i2p.data.SigningPrivateKey; -import net.i2p.data.SigningPublicKey; -import net.i2p.router.RouterContext; - -/** - * - * @author jrandom - */ -public class TunnelVerificationStructure extends DataStructureImpl { - private Hash _msgHash; - private Signature _authSignature; - - public TunnelVerificationStructure() { this(null, null); } - public TunnelVerificationStructure(Hash messageHash, Signature authSig) { - setMessageHash(messageHash); - setAuthorizationSignature(authSig); - } - - public Hash getMessageHash() { return _msgHash; } - public void setMessageHash(Hash hash) { _msgHash = hash; } - - public Signature getAuthorizationSignature() { return _authSignature; } - public void setAuthorizationSignature(Signature sig) { _authSignature = sig; } - - public void sign(RouterContext context, SigningPrivateKey key) { - if (_msgHash != null) { - Signature sig = context.dsa().sign(_msgHash.getData(), key); - setAuthorizationSignature(sig); - } - } - public boolean verifySignature(RouterContext context, SigningPublicKey key) { - if (_msgHash == null) return false; - return context.dsa().verifySignature(_authSignature, _msgHash.getData(), key); - } - - public void readBytes(InputStream in) throws DataFormatException, IOException { - _msgHash = new Hash(); - _msgHash.readBytes(in); - _authSignature = new Signature(); - _authSignature.readBytes(in); - } - - public void writeBytes(OutputStream out) throws DataFormatException, IOException { - if (_authSignature == null) { - _authSignature = new Signature(); - _authSignature.setData(Signature.FAKE_SIGNATURE); - } - if ( (_msgHash == null) || (_authSignature == null) ) throw new DataFormatException("Invalid data"); - _msgHash.writeBytes(out); - _authSignature.writeBytes(out); - } - - @Override - public boolean equals(Object obj) { - if ( (obj == null) || !(obj instanceof TunnelVerificationStructure)) - return false; - TunnelVerificationStructure str = (TunnelVerificationStructure)obj; - return DataHelper.eq(getMessageHash(), str.getMessageHash()) && - DataHelper.eq(getAuthorizationSignature(), str.getAuthorizationSignature()); - } - - @Override - public int hashCode() { - if ( (_msgHash == null) || (_authSignature == null) ) return 0; - return getMessageHash().hashCode() + getAuthorizationSignature().hashCode(); - } - - @Override - public String toString() { - return "[TunnelVerificationStructure: " + getMessageHash() + " " + getAuthorizationSignature() + "]"; - } -} From e46e747ac070b025f5199c497978687ebff63404 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 6 Dec 2009 15:16:52 +0000 Subject: [PATCH 040/127] add the anchor --- apps/routerconsole/jsp/configclients.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/routerconsole/jsp/configclients.jsp b/apps/routerconsole/jsp/configclients.jsp index 974673b31..b2f39c198 100644 --- a/apps/routerconsole/jsp/configclients.jsp +++ b/apps/routerconsole/jsp/configclients.jsp @@ -39,7 +39,7 @@ button span.hide{ <%=intl._("All changes require restart to take effect.")%>

      " /> -

      <%=intl._("WebApp Configuration")%>

      +

      <%=intl._("WebApp Configuration")%>

      <%=intl._("The Java web applications listed below are started by the webConsole client and run in the same JVM as the router. They are usually web applications accessible through the router console. They may be complete applications (e.g. i2psnark),front-ends to another client or application which must be separately enabled (e.g. susidns, i2ptunnel), or have no web interface at all (e.g. addressbook).")%>

      <%=intl._("A web app may also be disabled by removing the .war file from the webapps directory; however the .war file and web app will reappear when you update your router to a newer version, so disabling the web app here is the preferred method.")%> From c5b3c2f4304a0af233be9a9335a6168148cf0080 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 6 Dec 2009 15:17:47 +0000 Subject: [PATCH 041/127] add restart msg as requested by dr|z3d --- .../java/src/net/i2p/router/web/ConfigRestartBean.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java index 657039400..aacdfc91a 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java @@ -54,7 +54,12 @@ public class ConfigRestartBean { long timeRemaining = ctx.router().getShutdownTimeRemaining(); StringBuilder buf = new StringBuilder(128); if ((shuttingDown || restarting) && timeRemaining <= 0) { - buf.append("

      ").append(_("Shutdown imminent", ctx)).append("
      "); + buf.append("
      "); + if (restarting) + buf.append(_("Restart imminent", ctx)); + else + buf.append(_("Shutdown imminent", ctx)); + buf.append("
      "); } else if (shuttingDown) { buf.append("
      "); buf.append(_("Shutdown in {0}", DataHelper.formatDuration(timeRemaining), ctx)); From 2c456c291a76db7a799654caac534c6690e83021 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 6 Dec 2009 17:44:53 +0000 Subject: [PATCH 042/127] remove jsps from war --- apps/susidns/src/build.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/susidns/src/build.xml b/apps/susidns/src/build.xml index 35fbeb28c..a622f96c4 100644 --- a/apps/susidns/src/build.xml +++ b/apps/susidns/src/build.xml @@ -67,11 +67,9 @@ - - From 9d11866f86073942316adaf1f3ff30f380db590b Mon Sep 17 00:00:00 2001 From: russiansponsor Date: Sun, 6 Dec 2009 21:15:12 +0000 Subject: [PATCH 043/127] Removed Russian .po file. A native Russian speaker is working on a translation of the router console for the next version of I2P. Update the readme files to include a Russian flag. --- installer/resources/readme/readme.html | 1 + installer/resources/readme/readme_de.html | 2 +- installer/resources/readme/readme_fr.html | 2 +- installer/resources/readme/readme_nl.html | 2 +- installer/resources/readme/readme_ru.html | 36 ++++++++++++----------- installer/resources/readme/readme_sv.html | 2 +- installer/resources/readme/readme_zh.html | 1 + 7 files changed, 25 insertions(+), 21 deletions(-) diff --git a/installer/resources/readme/readme.html b/installer/resources/readme/readme.html index 79b7560ca..d7a3aea38 100644 --- a/installer/resources/readme/readme.html +++ b/installer/resources/readme/readme.html @@ -4,6 +4,7 @@ Deutsch Français Nederlands + Русский Svenska

      Welcome to I2P!

      diff --git a/installer/resources/readme/readme_de.html b/installer/resources/readme/readme_de.html index 54dbcb242..fd9b6053a 100644 --- a/installer/resources/readme/readme_de.html +++ b/installer/resources/readme/readme_de.html @@ -1,5 +1,5 @@
      -
      English Chinese Deutsch Français Nederlands Svenska
      +
      English Chinese Deutsch Français Nederlands Русский Svenska

      Willkommen zu I2P!

      Wenn Du gerade I2P gestartet hast, sollten die "Active:" Zahlen links in den nächsten paar Minuten anwachsen und Du siehst dann dort ein "shared clients" lokales Ziel gelistet (falls nicht, siehe Unten). Sobald das erscheint, kannst Du:

      diff --git a/installer/resources/readme/readme_fr.html b/installer/resources/readme/readme_fr.html index a3d38072c..7275153a2 100644 --- a/installer/resources/readme/readme_fr.html +++ b/installer/resources/readme/readme_fr.html @@ -1,5 +1,5 @@
      -
      English Chinese Deutsch Français Nederlands Svenska
      +
      English Chinese Deutsch Français Nederlands Русский Svenska

      Bienvenu a I2P!

      Si vous venez juste de lancer I2P, les chiffres sur la gauche à coté de Active devraient commencer à augmenter dans les prochaines minutes et vous verrez un "Shared client" en destination locale listés sur la gauche (si non, voir plus bas). Une fois qu'ils apparaissent, vous pouvez:

      diff --git a/installer/resources/readme/readme_nl.html b/installer/resources/readme/readme_nl.html index 71fe16cb1..2301724b6 100644 --- a/installer/resources/readme/readme_nl.html +++ b/installer/resources/readme/readme_nl.html @@ -1,5 +1,5 @@
      -
      English Chinese Deutsch Français Nederlands Svenska
      +
      English Chinese Deutsch Français Nederlands Русский Svenska

      Welkom bij I2P!

      Als je net I2P opgestart hebt, zullen de 'Active:' (Actieve) getallen aan de linkerkant in de komende minuten stijgen, en je zal een "Shared clients" (Gedeelde clients) lokale bestemming zien staan aan de linkerkant (indien niet, zie hieronder). Eenmaal je deze bestemming ziet, kan je:

      diff --git a/installer/resources/readme/readme_ru.html b/installer/resources/readme/readme_ru.html index 5dc2d8ef1..57e030ede 100644 --- a/installer/resources/readme/readme_ru.html +++ b/installer/resources/readme/readme_ru.html @@ -8,33 +8,35 @@ Svenska

      Добро пожаловать в I2P!

      -

      Если Вы только что запустили I2P — в ближайшие минуты числа слева в графе «Активные» должны начать расти и в списке «Локальные Пункты Назначения» должна появиться запись «общие клиенты» (если этого не случилось — см. «устранение неполадок»). После этого Вы сможете:

      +

      Когда Вы запускаете I2P впервые — числа в графе «Active» (слева) начнут расти постепенно, это может занять несколько минут. Затем в списке «Local Destinations» появится запись «shared clients» (если этого не случилось, см. «устранение неполадок»). + +

      После появления записи «shared clients» Вы можете:

        -
      • Просматривать I2P-сайты (веб-сайты хостящиеся анонимно внутри I2P сети) — настройте в Вашем браузере HTTP прокси-сервер 127.0.0.1:4444, затем попробуйте зайти на эти I2P-сайты:
        +
      • Просматривать I2P-сайты (веб-сайты хостящиеся анонимно внутри I2P сети). Для этого настройте в Вашем браузере HTTP прокси-сервер 127.0.0.1 порт 4444. С этими настройками попробуйте зайти на I2P-сайты по ссылкам ниже:
          -
        • inproxy.tino.i2p и perv.i2p: автоматически обновляющиеся списки активных I2P-сайтов
          • -
        • forum.i2p: безопасное и анонимное зеркало для форума forum.i2p2.de
          • -
        • www.i2p2.i2p или i2p-projekt.i2p: безопасное и анонимное зеркало для www.i2p2.de
          • -
        • eepsites.i2p: анонимная поисковая система по I2P-сайтам
          • -
        • ugha.i2p: I2P-вики, которую может редактировать любой пользователь, а также множество ссылок
          • -
        • fproxy.tino.i2p: Freenet-прокси
          • -
        • echelon.i2p: архив программного обеспечения для I2P
          • -
        • paste.i2p2.i2p: анонимный pastebin-сервис
          • +
        • inproxy.tino.i2p и perv.i2p — автоматически обновляющиеся списки активных I2P-сайтов
          • +
        • forum.i2p — безопасное и анонимное зеркало для форума forum.i2p2.de
          • +
        • www.i2p2.i2p или i2p-projekt.i2p — безопасное и анонимное зеркало для www.i2p2.de
          • +
        • eepsites.i2p — анонимная поисковая система по I2P-сайтам
          • +
        • ugha.i2p — I2P-вики, которую может редактировать любой пользователь, плюс множество ссылок
          • +
        • fproxy.tino.i2p — Freenet-прокси
          • +
        • echelon.i2p — архив программного обеспечения для I2P
          • +
        • paste.i2p2.i2p — анонимный pastebin-сервис

        - Существует также множество других I2P-сайтов — просто начните обход с указанных выше ссылок и добавляйте в свои закладки всё что вам понравится, и возвращайтесь почаще! + Существует множество других I2P-сайтов — пройдитесь по этому списку, добавьте в свои закладки всё, что Вам понравится. Возвращайтесь почаще!

        • -
      • Анонимно просматривать обычные веб-сайты — в I2P по умолчанию настроен глобальный анонимный «внешний прокси» («Outproxy»), через который будут перенаправляться ваши запросы к http-серверам обычного интернета. (При необходимости Вы можете отключить эту функцию в свойствах i2p-туннеля «eepProxy»)
        • +
      • Анонимно просматривать обычные веб-сайты — в I2P по умолчанию настроен глобальный анонимный «внешний прокси» («Outproxy»), через который будут перенаправляться Ваши запросы к http-серверам обычного интернета. (При необходимости Вы можете отключить эту функцию в свойствах i2p-туннеля «eepProxy»)
      • Передавать файлы — для этого есть встроенный порт BitTorrent-клиента Snark.
      • Пользоваться анонимной почтой — спасибо postman-у за создание почтовой системы hq.postman.i2p совместимой с обычными почтовыми клиентами (через протоколы POP3/SMTP). С её помощью можно обмениваться почтой как внутри I2P, так и с адресами обычного интернета. Мы также предлагаем попробовать Susimail — встроенный почтовый клиент с веб-интерфейсом, уже настроенный на работу с сервером postman-а, вам лишь остается создать аккаунт.
        • -
      • Общаться в анонимных чатах — запустите любой удобный для Вас IRC-клиент и подключитесь к серверу 127.0.0.1:6668. По этому адресу находится вход на два анонимно хостящихся IRC-сервера. Ваше реальное местоположение также не будет известно ни серверам, ни другим пользователям.
        • +
      • Общаться в анонимных чатах — запустите любой удобный для Вас IRC-клиент и подключитесь к серверу 127.0.0.1 порт 6668. По этому адресу расположен вход на два анонимно хостящихся IRC-сервера. Ваше реальное местоположение будет скрыто как от сервера, так и от других пользователей.
      • Вести анонимный блог — попробуйте Syndie
        • @@ -46,16 +48,16 @@ Просто поместите свои файлы в директорию eepsite/docroot/ (.war-файлы JSP/сервлетов в директорию eepsite/webapps/, а CGI-скрипты в директорию eepsite/cgi-bin/). -После этого достаточно запустить i2p-туннель «eepsite tunnel», указывающий на ваш сайт, и он станет доступным для других пользователей.

        +После этого достаточно запустить i2p-туннель «eepsite tunnel», указывающий на Ваш сайт, и он станет доступным для других пользователей.

        Подробную пошаговую инструкцию Вы можете найти на временной страничке-заготовке Вашего сайта.

        Поиск и устранение неполадок

        -

        Будьте терпеливы — первый старт I2P может оказаться довольно медленным из-за начального поиска пиров.

        +

        Наберитесь терпения — первый старт I2P может занять до получаса из-за начального поиска пиров. -

        Если по истечении 30 минут в графе «Активные» будет меньше 10 подсоединенных пиров, то для повышения качества соединения Вам следует открыть порт для I2P на Вашем файерволе или роутере (по умолчанию I2P использует порт 8887).

        +

        Если через 30 минут в графе «Active» все еще меньше 10 подсоединенных пиров, то для повышения качества соединения Вам нужно открыть порт для I2P на Вашем файерволе или роутере (по умолчанию I2P использует порт 8887).

        -

        Если Вы не можете соединиться ни с одним I2P-сайтом (даже www.i2p2.i2p), проверьте, включен ли в вашем браузере HTTP-прокси 127.0.0.1:4444.

        +

        Если Вы не можете соединиться ни с одним I2P-сайтом (даже www.i2p2.i2p), проверьте, включен ли в Вашем браузере HTTP-прокси 127.0.0.1 порт 4444.

        Кроме того, Вам может пригодиться справочная информация на сайте I2P. Не стесняйтесь задать интересующие вас вопросы на форуме I2P или на IRC каналах #i2p и #i2p-chat на серверах irc.freenode.net, irc.postman.i2p или irc.freshcoffee.i2p (последние два объединены в одну сеть, а на freenode работает бот-ретранслятор).

        diff --git a/installer/resources/readme/readme_sv.html b/installer/resources/readme/readme_sv.html index 4c02cfcdf..49c795bc8 100644 --- a/installer/resources/readme/readme_sv.html +++ b/installer/resources/readme/readme_sv.html @@ -1,5 +1,5 @@
        -
        English Chinese Deutsch Français Nederlands Svenska
        +
        English Chinese Deutsch Français Nederlands Русский Svenska

        Welcome to I2P!

        Om du just har startat I2P kommer de "Aktiva: #/#" börja öka inom diff --git a/installer/resources/readme/readme_zh.html b/installer/resources/readme/readme_zh.html index 2ebf15bde..b6f8e0261 100644 --- a/installer/resources/readme/readme_zh.html +++ b/installer/resources/readme/readme_zh.html @@ -4,6 +4,7 @@ Deutsch Français Nederlands + Русский Svenska

        欢迎使用 I2P!

        From 1cd54dc12e1dd223606b5c13bc15c042b21229e1 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 6 Dec 2009 21:42:28 +0000 Subject: [PATCH 044/127] * netdb.jsp: Fix bug caused by XSS fix * Translations: drop ru until after release --- .../src/net/i2p/router/web/NetDbHelper.java | 3 +- apps/routerconsole/locale/messages_ru.po | 3922 ----------------- history.txt | 4 + .../src/net/i2p/router/RouterVersion.java | 2 +- 4 files changed, 7 insertions(+), 3924 deletions(-) delete mode 100644 apps/routerconsole/locale/messages_ru.po diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java index 2e97b957e..18c454cc7 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java @@ -14,7 +14,8 @@ public class NetDbHelper extends HelperBase { public NetDbHelper() {} public void setRouter(String r) { - _routerPrefix = DataHelper.stripHTML(r); // XSS + if (r != null) + _routerPrefix = DataHelper.stripHTML(r); // XSS } public void setFull(String f) { diff --git a/apps/routerconsole/locale/messages_ru.po b/apps/routerconsole/locale/messages_ru.po deleted file mode 100644 index 03c4d3aba..000000000 --- a/apps/routerconsole/locale/messages_ru.po +++ /dev/null @@ -1,3922 +0,0 @@ -# I2P -# Copyright (C) 2009 The I2P Project -# This file is distributed under the same license as the routerconsole package. -# To contribute translations, see http://www.i2p2.de/newdevelopers -# foo , 2009. -# -msgid "" -msgstr "" -"Project-Id-Version: I2P routerconsole\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:47+0000\n" -"PO-Revision-Date: 2009-12-06 05:44+0300\n" -"Last-Translator: Russian Sponsor \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Russian\n" - -#: ../../../router/java/src/net/i2p/router/Blocklist.java:117 -#, java-format -msgid "Banned by router hash: {0}" -msgstr "Banned by router hash: {0}" - -#: ../../../router/java/src/net/i2p/router/Blocklist.java:119 -msgid "Banned by router hash" -msgstr "Забанен маршрутизатора хэш" - -#: ../../../router/java/src/net/i2p/router/Blocklist.java:664 -msgid "IP banned" -msgstr "IP banned" - -#: ../../../router/java/src/net/i2p/router/Blocklist.java:734 -#, java-format -msgid "IP banned by blocklist.txt entry {0}" -msgstr "IP запрещен в blocklist.txt этой записей {0}" - -#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:91 -msgid "Rejecting tunnels: Shutting down" -msgstr "Отвергая туннели: Выключение" - -#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:140 -msgid "Rejecting tunnels: High message delay" -msgstr "Отвергая туннели: Высокая сообщения задержка" - -#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:176 -msgid "Rejecting most tunnels: High number of requests" -msgstr "Отвергая большинстве туннелей: Высокое число запросов" - -#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:232 -msgid "Rejecting tunnels: Limit reached" -msgstr "Отвергая туннелей: дошел до предела" - -#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:300 -msgid "Rejecting tunnels: Bandwidth limit" -msgstr "Отвергая туннели: ограничить пропускную способность" - -#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:370 -msgid "Rejecting most tunnels: Bandwidth limit" -msgstr "Отвергая наиболее туннели: ограничить пропускную способность" - -#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:374 -msgid "Accepting most tunnels" -msgstr "Принимая большинство туннели" - -#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:376 -msgid "Accepting tunnels" -msgstr "Принимая туннелей" - -#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:486 -msgid "Rejecting tunnels" -msgstr "Отвергая туннелей" - -#: ../../../router/java/src/net/i2p/router/transport/GetBidsJob.java:70 -msgid "No transports (hidden or starting up?)" -msgstr "Нет транспорты (скрытой или начинать?)" - -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:450 -msgid "Unreachable on any transport" -msgstr "Недоступные на любом транспорте" - -#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:373 -#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:578 -#, java-format -msgid "Excessive clock skew: {0}" -msgstr "Чрезмерное часы не совпадающие по времени: {0}" - -#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:128 -msgid "Dropping tunnel requests: Too slow" -msgstr "Удаление туннель просит: слишком медленный" - -#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:340 -msgid "Dropping tunnel requests: Overloaded" -msgstr "Удаление туннель просит: Перегруженный" - -#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:499 -msgid "Rejecting tunnels: Request overload" -msgstr "Отвергая туннелей: Запрос перегрузки" - -#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:524 -msgid "Rejecting tunnels: Connection limit" -msgstr "Отвергая туннелей: Подключение к пределу" - -#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:725 -msgid "Dropping tunnel requests: High load" -msgstr "Удаление туннель просит: Высокие нагрузки" - -#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:734 -msgid "Dropping tunnel requests: Queue time" -msgstr "Удаление туннель просит: Очередь время" - -#: ../java/build/Countries.java:3 -msgid "Andorra" -msgstr "Андорра" - -#: ../java/build/Countries.java:4 -msgid "United Arab Emirates" -msgstr "Объединенные Арабские Эмираты" - -#: ../java/build/Countries.java:5 -msgid "Afghanistan" -msgstr "Афганистан" - -#: ../java/build/Countries.java:6 -msgid "Antigua and Barbuda" -msgstr "Антигуа и Барбуда" - -#: ../java/build/Countries.java:7 -msgid "Anguilla" -msgstr "Ангилья" - -#: ../java/build/Countries.java:8 -msgid "Albania" -msgstr "Албания" - -#: ../java/build/Countries.java:9 -msgid "Armenia" -msgstr "Армения" - -#: ../java/build/Countries.java:10 -msgid "Netherlands Antilles" -msgstr "Нидерландские Антильские острова" - -#: ../java/build/Countries.java:11 -msgid "Angola" -msgstr "Ангола" - -#: ../java/build/Countries.java:12 -msgid "Antarctica" -msgstr "Антарктида" - -#: ../java/build/Countries.java:13 -msgid "Argentina" -msgstr "Аргентина" - -#: ../java/build/Countries.java:14 -msgid "American Samoa" -msgstr "Американское Самоа" - -#: ../java/build/Countries.java:15 -msgid "Austria" -msgstr "Австрия" - -#: ../java/build/Countries.java:16 -msgid "Australia" -msgstr "Австралия" - -#: ../java/build/Countries.java:17 -msgid "Aruba" -msgstr "Аруба" - -#: ../java/build/Countries.java:19 -msgid "Azerbaijan" -msgstr "Азербайджан" - -#: ../java/build/Countries.java:20 -msgid "Bosnia and Herzegovina" -msgstr "Босния и Герцеговина" - -#: ../java/build/Countries.java:21 -msgid "Barbados" -msgstr "Барбадос" - -#: ../java/build/Countries.java:22 -msgid "Bangladesh" -msgstr "Бангладеш" - -#: ../java/build/Countries.java:23 -msgid "Belgium" -msgstr "Бельгия" - -#: ../java/build/Countries.java:24 -msgid "Burkina Faso" -msgstr "Буркина-Фасо" - -#: ../java/build/Countries.java:25 -msgid "Bulgaria" -msgstr "Болгария" - -#: ../java/build/Countries.java:26 -msgid "Bahrain" -msgstr "Бахрейн" - -#: ../java/build/Countries.java:27 -msgid "Burundi" -msgstr "Бурунди" - -#: ../java/build/Countries.java:28 -msgid "Benin" -msgstr "Бенин" - -#: ../java/build/Countries.java:29 -msgid "Bermuda" -msgstr "Бермудские Острова" - -#: ../java/build/Countries.java:30 -msgid "Brunei Darussalam" -msgstr "Бруней-Даруссалам" - -#: ../java/build/Countries.java:31 -msgid "Bolivia" -msgstr "Боливия" - -#: ../java/build/Countries.java:32 -msgid "Brazil" -msgstr "Бразилия" - -#: ../java/build/Countries.java:33 -msgid "Bahamas" -msgstr "Багамские острова" - -#: ../java/build/Countries.java:34 -msgid "Bhutan" -msgstr "Бутан" - -#: ../java/build/Countries.java:35 -msgid "Bouvet Island" -msgstr "Остров Буве" - -#: ../java/build/Countries.java:36 -msgid "Botswana" -msgstr "Ботсвана" - -#: ../java/build/Countries.java:37 -msgid "Belarus" -msgstr "Беларусь" - -#: ../java/build/Countries.java:38 -msgid "Belize" -msgstr "Белиз" - -#: ../java/build/Countries.java:39 -msgid "Canada" -msgstr "Канада" - -#: ../java/build/Countries.java:40 -msgid "The Democratic Republic of the Congo" -msgstr "Демократическая Республика Конго" - -#: ../java/build/Countries.java:41 -msgid "Central African Republic" -msgstr "Центральноафриканская Республика" - -#: ../java/build/Countries.java:42 -msgid "Congo" -msgstr "Конго" - -#: ../java/build/Countries.java:43 -msgid "Switzerland" -msgstr "Швейцария" - -#: ../java/build/Countries.java:44 -msgid "Cote D'Ivoire" -msgstr "Кот-д'Ивуар" - -#: ../java/build/Countries.java:45 -msgid "Cook Islands" -msgstr "Острова Кука" - -#: ../java/build/Countries.java:46 -msgid "Chile" -msgstr "Чили" - -#: ../java/build/Countries.java:47 -msgid "Cameroon" -msgstr "Камерун" - -#: ../java/build/Countries.java:48 -msgid "China" -msgstr "Китай" - -#: ../java/build/Countries.java:49 -msgid "Colombia" -msgstr "Колумбия" - -#: ../java/build/Countries.java:50 -msgid "Costa Rica" -msgstr "Коста-Рика" - -#: ../java/build/Countries.java:51 -msgid "Serbia and Montenegro" -msgstr "Сербия и Черногория" - -#: ../java/build/Countries.java:52 -msgid "Cuba" -msgstr "Куба" - -#: ../java/build/Countries.java:53 -msgid "Cape Verde" -msgstr "Кабо-Верде" - -#: ../java/build/Countries.java:54 -msgid "Cyprus" -msgstr "Кипр" - -#: ../java/build/Countries.java:55 -msgid "Czech Republic" -msgstr "Чехия" - -#: ../java/build/Countries.java:56 -msgid "Germany" -msgstr "Германия" - -#: ../java/build/Countries.java:57 -msgid "Djibouti" -msgstr "Джибути" - -#: ../java/build/Countries.java:58 -msgid "Denmark" -msgstr "Дания" - -#: ../java/build/Countries.java:59 -msgid "Dominica" -msgstr "Доминика" - -#: ../java/build/Countries.java:60 -msgid "Dominican Republic" -msgstr "Доминиканская Республика" - -#: ../java/build/Countries.java:61 -msgid "Algeria" -msgstr "Алжир" - -#: ../java/build/Countries.java:62 -msgid "Ecuador" -msgstr "Эквадор" - -#: ../java/build/Countries.java:63 -msgid "Estonia" -msgstr "Эстония" - -#: ../java/build/Countries.java:64 -msgid "Egypt" -msgstr "Египет" - -#: ../java/build/Countries.java:65 -msgid "Eritrea" -msgstr "Эритрея" - -#: ../java/build/Countries.java:66 -msgid "Spain" -msgstr "Испания" - -#: ../java/build/Countries.java:67 -msgid "Ethiopia" -msgstr "Эфиопия" - -#: ../java/build/Countries.java:68 -msgid "Finland" -msgstr "Финляндия" - -#: ../java/build/Countries.java:69 -msgid "Fiji" -msgstr "Фиджи" - -#: ../java/build/Countries.java:70 -msgid "Falkland Islands (Malvinas)" -msgstr "Фолклендские (Мальвинские)" - -#: ../java/build/Countries.java:71 -msgid "Federated States of Micronesia" -msgstr "Федеративные Штаты Микронезии" - -#: ../java/build/Countries.java:72 -msgid "Faroe Islands" -msgstr "Фарерские острова" - -#: ../java/build/Countries.java:73 -msgid "France" -msgstr "Франция" - -#: ../java/build/Countries.java:74 -msgid "Gabon" -msgstr "Габон" - -#: ../java/build/Countries.java:75 -msgid "United Kingdom" -msgstr "Великобритания" - -#: ../java/build/Countries.java:76 -msgid "Grenada" -msgstr "Гренада" - -#: ../java/build/Countries.java:77 -msgid "Georgia" -msgstr "Грузия" - -#: ../java/build/Countries.java:78 -msgid "French Guiana" -msgstr "Французская Гвиана" - -#: ../java/build/Countries.java:79 -msgid "Ghana" -msgstr "Гана" - -#: ../java/build/Countries.java:80 -msgid "Gibraltar" -msgstr "Гибралтар" - -#: ../java/build/Countries.java:81 -msgid "Greenland" -msgstr "Гренландия" - -#: ../java/build/Countries.java:82 -msgid "Gambia" -msgstr "Гамбия" - -#: ../java/build/Countries.java:83 -msgid "Guinea" -msgstr "Гвинея" - -#: ../java/build/Countries.java:84 -msgid "Guadeloupe" -msgstr "Гваделупа" - -#: ../java/build/Countries.java:85 -msgid "Equatorial Guinea" -msgstr "Экваториальная Гвинея" - -#: ../java/build/Countries.java:86 -msgid "Greece" -msgstr "Греция" - -#: ../java/build/Countries.java:87 -msgid "South Georgia and the South Sandwich Islands" -msgstr "Южная Джорджия и Южные Сандвичевы Острова" - -#: ../java/build/Countries.java:88 -msgid "Guatemala" -msgstr "Гватемала" - -#: ../java/build/Countries.java:89 -msgid "Guam" -msgstr "Гуам" - -#: ../java/build/Countries.java:90 -msgid "Guinea-Bissau" -msgstr "Гвинея-Бисау" - -#: ../java/build/Countries.java:91 -msgid "Guyana" -msgstr "Гайана" - -#: ../java/build/Countries.java:92 -msgid "Hong Kong" -msgstr "Гонконг" - -#: ../java/build/Countries.java:93 -msgid "Honduras" -msgstr "Гондурас" - -#: ../java/build/Countries.java:94 -msgid "Croatia" -msgstr "Хорватия" - -#: ../java/build/Countries.java:95 -msgid "Haiti" -msgstr "Гаити" - -#: ../java/build/Countries.java:96 -msgid "Hungary" -msgstr "Венгрия" - -#: ../java/build/Countries.java:97 -msgid "Indonesia" -msgstr "Индонезия" - -#: ../java/build/Countries.java:98 -msgid "Ireland" -msgstr "Ирландия" - -#: ../java/build/Countries.java:99 -msgid "Israel" -msgstr "Израиль" - -#: ../java/build/Countries.java:101 -msgid "India" -msgstr "Индия" - -#: ../java/build/Countries.java:102 -msgid "British Indian Ocean Territory" -msgstr "Британская территория в Индийском океане" - -#: ../java/build/Countries.java:103 -msgid "Iraq" -msgstr "Ирак" - -#: ../java/build/Countries.java:104 -msgid "Islamic Republic of Iran" -msgstr "Исламская Республика Иран" - -#: ../java/build/Countries.java:105 -msgid "Iceland" -msgstr "Исландия" - -#: ../java/build/Countries.java:106 -msgid "Italy" -msgstr "Италия" - -#: ../java/build/Countries.java:108 -msgid "Jamaica" -msgstr "Ямайка" - -#: ../java/build/Countries.java:109 -msgid "Jordan" -msgstr "Иордания" - -#: ../java/build/Countries.java:110 -msgid "Japan" -msgstr "Япония" - -#: ../java/build/Countries.java:111 -msgid "Kenya" -msgstr "Кения" - -#: ../java/build/Countries.java:112 -msgid "Kyrgyzstan" -msgstr "Кыргызстан" - -#: ../java/build/Countries.java:113 -msgid "Cambodia" -msgstr "Камбоджа" - -#: ../java/build/Countries.java:114 -msgid "Kiribati" -msgstr "Кирибати" - -#: ../java/build/Countries.java:115 -msgid "Comoros" -msgstr "Коморские Острова" - -#: ../java/build/Countries.java:116 -msgid "Saint Kitts and Nevis" -msgstr "Сент-Китс и Невис" - -#: ../java/build/Countries.java:117 -msgid "Republic of Korea" -msgstr "Республика Корея" - -#: ../java/build/Countries.java:118 -msgid "Kuwait" -msgstr "Кувейт" - -#: ../java/build/Countries.java:119 -msgid "Cayman Islands" -msgstr "Каймановы острова" - -#: ../java/build/Countries.java:120 -msgid "Kazakhstan" -msgstr "Казахстан" - -#: ../java/build/Countries.java:121 -msgid "Lao People's Democratic Republic" -msgstr "Лаосская Народно-Демократическая Республика" - -#: ../java/build/Countries.java:122 -msgid "Lebanon" -msgstr "Ливан" - -#: ../java/build/Countries.java:123 -msgid "Saint Lucia" -msgstr "Сент-Люсия" - -#: ../java/build/Countries.java:124 -msgid "Liechtenstein" -msgstr "Лихтенштейн" - -#: ../java/build/Countries.java:125 -msgid "Sri Lanka" -msgstr "Шри-Ланка" - -#: ../java/build/Countries.java:126 -msgid "Liberia" -msgstr "Либерия" - -#: ../java/build/Countries.java:127 -msgid "Lesotho" -msgstr "Лесото" - -#: ../java/build/Countries.java:128 -msgid "Lithuania" -msgstr "Литва" - -#: ../java/build/Countries.java:129 -msgid "Luxembourg" -msgstr "Люксембург" - -#: ../java/build/Countries.java:130 -msgid "Latvia" -msgstr "Латвия" - -#: ../java/build/Countries.java:131 -msgid "Libyan Arab Jamahiriya" -msgstr "Ливийская Арабская Джамахирия" - -#: ../java/build/Countries.java:132 -msgid "Morocco" -msgstr "Марокко" - -#: ../java/build/Countries.java:133 -msgid "Monaco" -msgstr "Монако" - -#: ../java/build/Countries.java:134 -msgid "Republic of Moldova" -msgstr "Республика Молдова" - -#: ../java/build/Countries.java:137 -msgid "Madagascar" -msgstr "Мадагаскар" - -#: ../java/build/Countries.java:138 -msgid "Marshall Islands" -msgstr "Маршалловы Острова" - -#: ../java/build/Countries.java:139 -msgid "The Former Yugoslav Republic of Macedonia" -msgstr "Бывшая югославская Республика Македония" - -#: ../java/build/Countries.java:140 -msgid "Mali" -msgstr "Мали" - -#: ../java/build/Countries.java:141 -msgid "Myanmar" -msgstr "Мьянма" - -#: ../java/build/Countries.java:142 -msgid "Mongolia" -msgstr "Монголия" - -#: ../java/build/Countries.java:143 -msgid "Macao" -msgstr "Макао" - -#: ../java/build/Countries.java:144 -msgid "Northern Mariana Islands" -msgstr "Северные Марианские о-ва" - -#: ../java/build/Countries.java:145 -msgid "Martinique" -msgstr "Мартиника" - -#: ../java/build/Countries.java:146 -msgid "Mauritania" -msgstr "Мавритания" - -#: ../java/build/Countries.java:147 -msgid "Montserrat" -msgstr "Монтсеррат" - -#: ../java/build/Countries.java:148 -msgid "Malta" -msgstr "Мальта" - -#: ../java/build/Countries.java:149 -msgid "Mauritius" -msgstr "Маврикий" - -#: ../java/build/Countries.java:150 -msgid "Maldives" -msgstr "Мальдивы" - -#: ../java/build/Countries.java:151 -msgid "Malawi" -msgstr "Малави" - -#: ../java/build/Countries.java:152 -msgid "Mexico" -msgstr "Мексика" - -#: ../java/build/Countries.java:153 -msgid "Malaysia" -msgstr "Малайзия" - -#: ../java/build/Countries.java:154 -msgid "Mozambique" -msgstr "Мозамбик" - -#: ../java/build/Countries.java:155 -msgid "Namibia" -msgstr "Мозамбик" - -#: ../java/build/Countries.java:156 -msgid "New Caledonia" -msgstr "Новая Каледония" - -#: ../java/build/Countries.java:157 -msgid "Niger" -msgstr "Нигер" - -#: ../java/build/Countries.java:158 -msgid "Norfolk Island" -msgstr "Остров Норфолк" - -#: ../java/build/Countries.java:159 -msgid "Nigeria" -msgstr "Нигерия" - -#: ../java/build/Countries.java:160 -msgid "Nicaragua" -msgstr "Никарагуа" - -#: ../java/build/Countries.java:161 -msgid "Netherlands" -msgstr "Нидерланды" - -#: ../java/build/Countries.java:162 -msgid "Norway" -msgstr "Норвегия" - -#: ../java/build/Countries.java:163 -msgid "Nepal" -msgstr "Непал" - -#: ../java/build/Countries.java:164 -msgid "Nauru" -msgstr "Науру" - -#: ../java/build/Countries.java:165 -msgid "Niue" -msgstr "Ниуэ" - -#: ../java/build/Countries.java:166 -msgid "New Zealand" -msgstr "Новая Зеландия" - -#: ../java/build/Countries.java:167 -msgid "Oman" -msgstr "Оман" - -#: ../java/build/Countries.java:168 -msgid "Panama" -msgstr "Панама" - -#: ../java/build/Countries.java:169 -msgid "Peru" -msgstr "Перу" - -#: ../java/build/Countries.java:170 -msgid "French Polynesia" -msgstr "Французская Полинезия" - -#: ../java/build/Countries.java:171 -msgid "Papua New Guinea" -msgstr "Папуа-Новая Гвинея" - -#: ../java/build/Countries.java:172 -msgid "Philippines" -msgstr "Филиппины" - -#: ../java/build/Countries.java:173 -msgid "Pakistan" -msgstr "Пакистан" - -#: ../java/build/Countries.java:174 -msgid "Poland" -msgstr "Польша" - -#: ../java/build/Countries.java:175 -msgid "Saint Pierre and Miquelon" -msgstr "Сен-Пьер и Микелон" - -#: ../java/build/Countries.java:176 -msgid "Puerto Rico" -msgstr "Пуэрто-Рико" - -#: ../java/build/Countries.java:177 -msgid "Palestinian Territory" -msgstr "Палестинская автономия" - -#: ../java/build/Countries.java:178 -msgid "Portugal" -msgstr "Португалия" - -#: ../java/build/Countries.java:179 -msgid "Palau" -msgstr "Палау" - -#: ../java/build/Countries.java:180 -msgid "Paraguay" -msgstr "Парагвай" - -#: ../java/build/Countries.java:181 -msgid "Qatar" -msgstr "Катар" - -#: ../java/build/Countries.java:182 -msgid "Reunion" -msgstr "Реюньон" - -#: ../java/build/Countries.java:183 -msgid "Romania" -msgstr "Румыния" - -#: ../java/build/Countries.java:184 -msgid "Serbia" -msgstr "Сербия" - -#: ../java/build/Countries.java:185 -msgid "Russian Federation" -msgstr "Русская Федерация" - -#: ../java/build/Countries.java:186 -msgid "Rwanda" -msgstr "Руанда" - -#: ../java/build/Countries.java:187 -msgid "Saudi Arabia" -msgstr "Саудовская Аравия" - -#: ../java/build/Countries.java:188 -msgid "Solomon Islands" -msgstr "Соломоновы Острова" - -#: ../java/build/Countries.java:189 -msgid "Seychelles" -msgstr "Сейшельские Острова" - -#: ../java/build/Countries.java:190 -msgid "Sudan" -msgstr "Судан" - -#: ../java/build/Countries.java:191 -msgid "Sweden" -msgstr "Швеция" - -#: ../java/build/Countries.java:192 -msgid "Singapore" -msgstr "Сингапур" - -#: ../java/build/Countries.java:193 -msgid "Slovenia" -msgstr "Словения" - -#: ../java/build/Countries.java:194 -msgid "Slovakia" -msgstr "Словакия" - -#: ../java/build/Countries.java:195 -msgid "Sierra Leone" -msgstr "Сьерра-Леоне" - -#: ../java/build/Countries.java:196 -msgid "San Marino" -msgstr "Сан - Марине" - -#: ../java/build/Countries.java:197 -msgid "Senegal" -msgstr "Сенегал" - -#: ../java/build/Countries.java:198 -msgid "Somalia" -msgstr "Сомали" - -#: ../java/build/Countries.java:199 -msgid "Suriname" -msgstr "Суринам" - -#: ../java/build/Countries.java:200 -msgid "Sao Tome and Principe" -msgstr "Сан-Томе и Принсипи" - -#: ../java/build/Countries.java:201 -msgid "El Salvador" -msgstr "Сальвадор" - -#: ../java/build/Countries.java:202 -msgid "Syrian Arab Republic" -msgstr "Сирийская Арабская Республика" - -#: ../java/build/Countries.java:203 -msgid "Swaziland" -msgstr "Свазиленд" - -#: ../java/build/Countries.java:204 -msgid "Turks and Caicos Islands" -msgstr "Острова Теркс и Кайкос" - -#: ../java/build/Countries.java:205 -msgid "Chad" -msgstr "Чад" - -#: ../java/build/Countries.java:206 -msgid "French Southern Territories" -msgstr "Французские Южные Территории" - -#: ../java/build/Countries.java:207 -msgid "Togo" -msgstr "Того" - -#: ../java/build/Countries.java:208 -msgid "Thailand" -msgstr "Таиланд" - -#: ../java/build/Countries.java:209 -msgid "Tajikistan" -msgstr "Таджикистан" - -#: ../java/build/Countries.java:210 -msgid "Tokelau" -msgstr "Токелау" - -#: ../java/build/Countries.java:211 -msgid "Timor-Leste" -msgstr "Восточный Тимор" - -#: ../java/build/Countries.java:212 -msgid "Turkmenistan" -msgstr "Туркменистан" - -#: ../java/build/Countries.java:213 -msgid "Tunisia" -msgstr "Тунис" - -#: ../java/build/Countries.java:214 -msgid "Tonga" -msgstr "Тонга" - -#: ../java/build/Countries.java:215 -msgid "Turkey" -msgstr "Турция" - -#: ../java/build/Countries.java:216 -msgid "Trinidad and Tobago" -msgstr "Тринидад и Тобаго" - -#: ../java/build/Countries.java:217 -msgid "Tuvalu" -msgstr "Тувалу" - -#: ../java/build/Countries.java:218 -msgid "Taiwan" -msgstr "Тайвань" - -#: ../java/build/Countries.java:219 -msgid "United Republic of Tanzania" -msgstr "Объединенная Республика Танзания" - -#: ../java/build/Countries.java:220 -msgid "Ukraine" -msgstr "Украина" - -#: ../java/build/Countries.java:221 -msgid "Uganda" -msgstr "Уганда" - -#: ../java/build/Countries.java:222 -msgid "United States Minor Outlying Islands" -msgstr "Внешние малые острова (США)" - -#: ../java/build/Countries.java:223 -msgid "United States" -msgstr "Соединенные Штаты Америки" - -#: ../java/build/Countries.java:224 -msgid "Uruguay" -msgstr "Уругвай" - -#: ../java/build/Countries.java:225 -msgid "Uzbekistan" -msgstr "Узбекистан" - -#: ../java/build/Countries.java:226 -msgid "Holy See (Vatican City State)" -msgstr "Святой Престол (Ватикан)" - -#: ../java/build/Countries.java:227 -msgid "Saint Vincent and the Grenadines" -msgstr "Сент-Винсент и Гренадины" - -#: ../java/build/Countries.java:228 -msgid "Venezuela" -msgstr "Венесуэла" - -#: ../java/build/Countries.java:229 -#: ../java/build/Countries.java:230 -msgid "Virgin Islands" -msgstr "Виргинские острова" - -#: ../java/build/Countries.java:231 -msgid "Viet Nam" -msgstr "Вьетнам" - -#: ../java/build/Countries.java:232 -msgid "Vanuatu" -msgstr "Вануату" - -#: ../java/build/Countries.java:233 -msgid "Wallis and Futuna" -msgstr "Уоллис и Футуна" - -#: ../java/build/Countries.java:234 -msgid "Samoa" -msgstr "Самоа" - -#: ../java/build/Countries.java:235 -msgid "Yemen" -msgstr "Йемен" - -#: ../java/build/Countries.java:236 -msgid "Mayotte" -msgstr "Майотта" - -#: ../java/build/Countries.java:237 -msgid "South Africa" -msgstr "Южная Африка" - -#: ../java/build/Countries.java:238 -msgid "Zambia" -msgstr "Замбия" - -#: ../java/build/Countries.java:239 -msgid "Zimbabwe" -msgstr "Зимбабве" - -#: ../java/src/net/i2p/router/web/CSSHelper.java:41 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:28 -#: ../java/strings/Strings.java:29 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/index_jsp.java:234 -msgid "I2P Router Console" -msgstr "Консоль Маршрутизатора I2P" - -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:57 -msgid "Error updating the configuration - please see the error logs" -msgstr "Ошибка при обновлении конфигурации - смотрите логи ошибок" - -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:69 -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:251 -msgid "Configuration saved successfully" -msgstr "Конфигурация успешно сохранены" - -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:253 -msgid "Error saving the configuration (applied but not saved) - please see the error logs" -msgstr "Ошибка при сохранении конфигурации (применяется, но не сохранили) - пожалуйста, смотрите логи ошибок" - -#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:32 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:321 -msgid "Save Client Configuration" -msgstr "Сохраните Настройки Клиента" - -#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:36 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:333 -msgid "Save WebApp Configuration" -msgstr "Сохранять WebApp Конфигурацию" - -#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:54 -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:67 -msgid "Start" -msgstr "Включать" - -#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:68 -#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:49 -msgid "Unsupported" -msgstr "Неподдерживаемый" - -#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:83 -msgid "Client configuration saved successfully - restart required to take effect." -msgstr "Настройка клиента успешно сохранены - Требуется перезагрузка вступили в силу." - -#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:89 -msgid "Bad client index." -msgstr "Индекс плохой клиент." - -#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:94 -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:17 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:359 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:371 -msgid "Client" -msgstr "Клиент" - -#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:94 -#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:129 -msgid "started" -msgstr "началось" - -#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:111 -msgid "WebApp configuration saved successfully - restart required to take effect." -msgstr "Конфигурация веб-приложений успешно сохранены - Требуется перезагрузка вступили в силу." - -#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:129 -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:34 -msgid "WebApp" -msgstr "Веб-приложение" - -#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:131 -msgid "Failed to start" -msgstr "Сбой при запуске" - -#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:137 -msgid "Failed to find server." -msgstr "Не удалось найти сервер." - -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:17 -msgid "Class and arguments" -msgstr "Класс и параметры" - -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:17 -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:34 -msgid "Run at Startup?" -msgstr "Запустить при следующем запуске системы?" - -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:17 -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:34 -msgid "Start Now" -msgstr "Запустить Cейчас" - -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:34 -msgid "Description" -msgstr "Описание" - -#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:18 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:320 -msgid "Add key" -msgstr "Добавить ключ" - -#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:19 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:322 -msgid "Delete key" -msgstr "Удалить ключ" - -#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:21 -msgid "You must enter a destination" -msgstr "Вы должны ввести назначения" - -#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:23 -msgid "You must enter a key" -msgstr "Вы должны ввести ключевые" - -#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:34 -#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:41 -#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:43 -msgid "Key for" -msgstr "Ключ для" - -#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:34 -msgid "added to keyring" -msgstr "добавить в связку ключей" - -#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:36 -msgid "Invalid destination or key" -msgstr "Invalid destination or key" - -#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:41 -msgid "removed from keyring" -msgstr "удалены из связку ключей" - -#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:43 -msgid "not found in keyring" -msgstr "Не найдено в связку ключей" - -#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:45 -msgid "Invalid destination" -msgstr "Invalid destination" - -#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52 -msgid "CRIT" -msgstr "КРИТИЧЕСКИЕ" - -#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52 -msgid "DEBUG" -msgstr "ОТЛАДКА" - -#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52 -msgid "ERROR" -msgstr "ОШИБКА" - -#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52 -msgid "INFO" -msgstr "ИНФОРМАЦИЯ" - -#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52 -msgid "WARN" -msgstr "ПРЕДУПРЕЖДЕНИЕ" - -#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18 -msgid "Network" -msgstr "Сеть" - -#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18 -msgid "Service" -msgstr "Сервис" - -#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:82 -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:253 -msgid "Tunnels" -msgstr "Туннели" - -#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18 -msgid "UI" -msgstr "Интерфейс Пользователя" - -#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:205 -msgid "Update" -msgstr "Обновление" - -#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 -msgid "Clients" -msgstr "Клиенты" - -#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:292 -msgid "Keyring" -msgstr "Cвязку Kлючей" - -#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 -msgid "Logging" -msgstr "Логи" - -#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:88 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 -msgid "Peers" -msgstr "Пиры" - -#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:293 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:124 -msgid "Stats" -msgstr "Статистика" - -#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20 -msgid "Advanced" -msgstr "Расширенный" - -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:47 -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:249 -#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:35 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:357 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:494 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:333 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:373 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:341 -msgid "Save changes" -msgstr "Сохранить изменения" - -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:119 -msgid "Rechecking router reachability..." -msgstr "Повторная проверка доступности маршрутизатора..." - -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:148 -msgid "Updating IP address" -msgstr "Обновление IP-адреса" - -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:166 -msgid "Disabling TCP completely" -msgstr "Отключение TCP полностью" - -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:170 -msgid "Updating inbound TCP address to" -msgstr "Обновление входящего в адрес TCP" - -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:174 -msgid "Disabling inbound TCP" -msgstr "Отключение входящие TCP" - -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:176 -msgid "Updating inbound TCP address to auto" -msgstr "Обновление входящего адреса TCP автоматически" - -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:185 -msgid "Updating inbound TCP port to" -msgstr "Обновление входящего порта TCP для" - -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:188 -msgid "Updating inbound TCP port to auto" -msgstr "Обновление входящего порта TCP автоматически" - -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:200 -msgid "Updating UDP port from" -msgstr "Обновление от UDP порта" - -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:200 -msgid "to" -msgstr "к" - -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:216 -msgid "Gracefully restarting into Hidden Router Mode" -msgstr "Правильно перезапуска в скрытые режиме маршрутизатора" - -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:218 -msgid "Gracefully restarting to exit Hidden Router Mode" -msgstr "Правильно перезапуска для выхода Скрытый режим маршрутизатора" - -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:227 -msgid "Enabling UPnP, restart required to take effect" -msgstr "Включение UPnP, необходима перезагрузка вступили в силу" - -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:229 -msgid "Disabling UPnP, restart required to take effect" -msgstr "Отключение UPnP, необходима перезагрузка вступили в силу" - -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:235 -msgid "Requiring SSU introduers" -msgstr "Требование SSU поручителями" - -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:275 -msgid "Gracefully restarting I2P to change published router address" -msgstr "Правильно перезапуска I2P изменить опубликован адрес маршрутизатора" - -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:293 -msgid "Updating bandwidth share percentage" -msgstr "Обновление пропускную процентной доли" - -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:363 -msgid "Updated bandwidth limits" -msgstr "Обновлен пределы полосы пропускания" - -#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:39 -#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:47 -#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:50 -#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:57 -#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:60 -msgid "unknown" -msgstr "неизвестный" - -#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:165 -msgid "bits per second" -msgstr "бит в секунду" - -#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:20 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:314 -msgid "Ban peer until restart" -msgstr "Запрет пир пока маршрутизатора перезагружается" - -#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:23 -#, java-format -msgid "Manually banned via {0}" -msgstr "Вручную запретили через {0}" - -#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:24 -#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:33 -#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:35 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:81 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:187 -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:235 -msgid "Peer" -msgstr "Пир" - -#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:24 -msgid "banned until restart" -msgstr "Запрещена пока перезагрузка" - -#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:27 -#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:38 -#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:59 -msgid "Invalid peer" -msgstr "Неверное сверстников" - -#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:28 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:316 -msgid "Unban peer" -msgstr "Отмена запрета пира" - -#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:33 -msgid "unbanned" -msgstr "запрет удален" - -#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:35 -msgid "is not currently banned" -msgstr "в настоящее время не запрещена" - -#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:39 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:322 -msgid "Adjust Profile Bonuses" -msgstr "Настройка дополнительных потоков профиля" - -#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:47 -msgid "Bad speed value" -msgstr "Неправильное значение скорости" - -#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:52 -msgid "Bad capacity value" -msgstr "Неправильное значение потенциала" - -#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:32 -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:57 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:292 -msgid "Shutdown immediately" -msgstr "Выключить сразу" - -#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:36 -msgid "Cancel shutdown" -msgstr "Отмена выключения" - -#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:37 -msgid "Cancel restart" -msgstr "Отмена перезагрузка" - -#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:39 -msgid "Restart immediately" -msgstr "Перезагрузка сразу" - -#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:43 -msgid "Restart" -msgstr "Перезагрузка" - -#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:46 -msgid "Shutdown" -msgstr "Выключение" - -#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:57 -msgid "Shutdown imminent" -msgstr "Выключения неминуемого" - -#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:60 -#, java-format -msgid "Shutdown in {0}" -msgstr "Выключение через {0}" - -#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:65 -#, java-format -msgid "Restart in {0}" -msgstr "Перезагрузка через {0}" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:53 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:290 -msgid "Shutdown gracefully" -msgstr "Грациозно выключить" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:56 -msgid "Graceful shutdown initiated" -msgstr "Изящный выключение инициативе" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:60 -msgid "Shutdown immediately! boom bye bye bad bwoy" -msgstr "выключения немедленно! бум пока пока плохой мальчик" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:61 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:294 -msgid "Cancel graceful shutdown" -msgstr "Отмена изящные выключении" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:63 -msgid "Graceful shutdown cancelled" -msgstr "Изящный выключения отменен" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:64 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:308 -msgid "Graceful restart" -msgstr "Мягкого перезапуска" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:67 -msgid "Graceful restart requested" -msgstr "Мягкого перезапуска просил" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:68 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:310 -msgid "Hard restart" -msgstr "Жесткая перезагрузка" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:71 -msgid "Hard restart requested" -msgstr "Жесткая перезагрузка просил" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:72 -msgid "Rekey and Restart" -msgstr "Восстановить Ключ и Перезагрузите" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:73 -msgid "Rekeying after graceful restart" -msgstr "Повторный ввод после мягкого перезапуска" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:76 -msgid "Rekey and Shutdown" -msgstr "Восстановить Ключ и Выключении" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:77 -msgid "Rekeying after graceful shutdown" -msgstr "Повторный ввод после выключения изящный" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:80 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:338 -msgid "Run I2P on startup" -msgstr "Запуск I2P при запуске" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:82 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:340 -msgid "Don't run I2P on startup" -msgstr "Не запускать при запуске I2P" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:84 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:356 -msgid "Dump threads" -msgstr "Сваливать Память" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:91 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:324 -msgid "Show systray icon" -msgstr "Показать системном трее значок" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:96 -msgid "System tray icon enabled." -msgstr "Значок на панели задач включена." - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:98 -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:110 -msgid "System tray icon feature not supported on this platform. Sorry!" -msgstr "Значок на панели задач функция не поддерживается на этой платформе. Извините!" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:101 -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:113 -msgid "Warning: unable to contact the systray manager" -msgstr "Предупреждение: Не удается связаться с менеджером системный трей" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:103 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:326 -msgid "Hide systray icon" -msgstr "Скрыть системном трее значок" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:108 -msgid "System tray icon disabled." -msgstr "Значок на панели задач отключен." - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:115 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:364 -msgid "View console on startup" -msgstr "Открыть консоль при старте" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:117 -msgid "Console is to be shown on startup" -msgstr "Консоль будет показано при старте" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:118 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:366 -msgid "Do not view console on startup" -msgstr "Не рассматривают консоль при старте" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:120 -msgid "Console is not to be shown on startup" -msgstr "Консоли не будет показано при старте" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:129 -msgid "Service installed" -msgstr "Установлена служба" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:131 -msgid "Warning: unable to install the service" -msgstr "Предупреждение: не удалось установить службу" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:137 -msgid "Service removed" -msgstr "Служба удалена" - -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:139 -msgid "Warning: unable to remove the service" -msgstr "Предупреждение: Не удается удалить службу" - -#: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:118 -msgid "Stat filter and location updated successfully to" -msgstr "Стат фильтра и расположения успешно обновлена до" - -#: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:120 -msgid "Failed to update the stat filter and location" -msgstr "Не удалось обновить фильтра стат и местоположение" - -#: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:121 -msgid "Graph list updated, may take up to 60s to be reflected here and on the Graphs Page" -msgstr "Графика список обновляется, может занять до 60s должно быть отражено здесь и на графов странице " - -#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:137 -msgid "Updated settings for all pools." -msgstr "Обновление настройки для всех бассейнов." - -#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:142 -msgid "Exploratory tunnel configuration saved successfully." -msgstr "Разведочный конфигурации туннеля успешно сохранены." - -#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:144 -#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:36 -msgid "Error saving the configuration (applied but not saved) - please see the error logs." -msgstr "Ошибка при сохранении конфигурации (применяется, но не сохранили) - пожалуйста, смотрите логи ошибок." - -#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:11 -msgid "hop" -msgstr "хоп" - -#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:12 -msgid "tunnel" -msgstr "туннель" - -#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:14 -msgid "hops" -msgstr "хопа" - -#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:15 -msgid "tunnels" -msgstr "туннели" - -#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:26 -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:40 -msgid "Exploratory tunnels" -msgstr "Разведочные туннели" - -#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:46 -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:60 -msgid "Client tunnels for" -msgstr "Клиентские туннели для" - -#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:69 -msgid "ANONYMITY WARNING - Settings include 0-hop tunnels." -msgstr "АНОНИМНОСТЬ ПРЕДУПРЕЖДЕНИЕ - Настройки включают 0-хоп туннелей." - -#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:74 -msgid "ANONYMITY WARNING - Settings include 1-hop tunnels." -msgstr "ANONYMITY WARNING - Settings include 1-hop tunnels." - -#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:77 -msgid "PERFORMANCE WARNING - Settings include very long tunnels." -msgstr "ИСПОЛНЕНИИ ВНИМАНИЕ - настройки включают в себя очень длинные туннели." - -#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:80 -msgid "PERFORMANCE WARNING - Settings include high tunnel quantities." -msgstr "ИСПОЛНЕНИИ ВНИМАНИЕ - настройки включают в больших количествах туннель." - -#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:82 -msgid "Inbound" -msgstr "Входящий" - -#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:82 -msgid "Outbound" -msgstr "Исходящие" - -#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:87 -msgid "Depth" -msgstr "Глубина" - -#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:104 -msgid "Randomization" -msgstr "Рандомизации" - -#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:128 -msgid "Quantity" -msgstr "Колич." - -#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:145 -msgid "Backup quantity" -msgstr "Резервное копирование количестве" - -#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:167 -msgid "Inbound options" -msgstr "Входящий конфигурации" - -#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:180 -msgid "Outbound options" -msgstr "Исходящие конфигурации" - -#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:31 -msgid "Theme change saved." -msgstr "Изменение сохраненной тема." - -#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:33 -msgid "Refresh the page to view." -msgstr "Обновите страницу, чтобы просмотреть." - -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:41 -msgid "English" -msgstr "Английский" - -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:41 -msgid "French" -msgstr "Французский" - -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:41 -msgid "German" -msgstr "Немецкий" - -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:42 -msgid "Chinese" -msgstr "Китайский" - -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:42 -msgid "Dutch" -msgstr "Голландский" - -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:42 -msgid "Russian" -msgstr "Русский" - -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:42 -msgid "Swedish" -msgstr "Шведский" - -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:56 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:310 -msgid "Check for updates" -msgstr "Проверка обновлений" - -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:63 -msgid "Update available, attempting to download now" -msgstr "Доступно обновление, пытаясь загрузить сейчас" - -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:65 -msgid "Update available, click button on left to download" -msgstr "Доступные обновления, нажмите кнопку на левой скачать" - -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:67 -msgid "No update available" -msgstr "Нет доступных обновлений" - -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:75 -msgid "Updating news URL to" -msgstr "Обновление новостей на URL" - -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:83 -msgid "Updating proxy host to" -msgstr "Обновление прокси-сервера для" - -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:91 -msgid "Updating proxy port to" -msgstr "Обновление прокси порта" - -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:104 -msgid "Updating refresh frequency to" -msgstr "Обновление частоту обновления для" - -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:111 -msgid "Updating update policy to" -msgstr "Updating update rules to" - -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:120 -msgid "Updating update URLs." -msgstr "Обновляет обновления URL-адресов." - -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:128 -msgid "Updating trusted keys." -msgstr "Обновление доверенных ключей." - -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:136 -msgid "Updating unsigned update URL to" -msgstr "Обновление неподписанных URL обновления" - -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:75 -#: ../java/src/net/i2p/router/web/GraphHelper.java:115 -msgid "Never" -msgstr "Никогда" - -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:77 -msgid "Every" -msgstr "Каждый" - -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:90 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:92 -msgid "Notify only" -msgstr "Сообщите только" - -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:95 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:97 -msgid "Download and verify only" -msgstr "Скачать и проверить только" - -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:101 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:103 -msgid "Download, verify, and restart" -msgstr "Скачать, проверки и перезапуск" - -#: ../java/src/net/i2p/router/web/GraphHelper.java:107 -msgid "Configure Graph Display" -msgstr "Конфигурация Диаграмм Дисплея" - -#: ../java/src/net/i2p/router/web/GraphHelper.java:107 -msgid "Select Stats" -msgstr "Выберите статистику" - -#: ../java/src/net/i2p/router/web/GraphHelper.java:109 -msgid "Periods" -msgstr "Периоды" - -#: ../java/src/net/i2p/router/web/GraphHelper.java:110 -msgid "Plot averages" -msgstr "Среднее значение диаграммы" - -#: ../java/src/net/i2p/router/web/GraphHelper.java:111 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:405 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:336 -msgid "or" -msgstr "или" - -#: ../java/src/net/i2p/router/web/GraphHelper.java:111 -msgid "plot events" -msgstr "показания диаграммы" - -#: ../java/src/net/i2p/router/web/GraphHelper.java:112 -msgid "Image sizes" -msgstr "Размеры изображения" - -#: ../java/src/net/i2p/router/web/GraphHelper.java:112 -msgid "width" -msgstr "ширина" - -#: ../java/src/net/i2p/router/web/GraphHelper.java:113 -msgid "height" -msgstr "высота" - -#: ../java/src/net/i2p/router/web/GraphHelper.java:113 -#: ../java/src/net/i2p/router/web/GraphHelper.java:114 -msgid "pixels" -msgstr "пиксели" - -#: ../java/src/net/i2p/router/web/GraphHelper.java:115 -msgid "Refresh delay" -msgstr "Задержка обновления" - -#: ../java/src/net/i2p/router/web/GraphHelper.java:115 -msgid "hour" -msgstr "час" - -#: ../java/src/net/i2p/router/web/GraphHelper.java:115 -msgid "minute" -msgstr "минута" - -#: ../java/src/net/i2p/router/web/GraphHelper.java:115 -msgid "minutes" -msgstr "минуты" - -#: ../java/src/net/i2p/router/web/GraphHelper.java:116 -msgid "Redraw" -msgstr "Перерисовать" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:59 -msgid "Network Database RouterInfo Lookup" -msgstr "Поиск Информации о Маршрутизаторе Базы Данных Сети" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:74 -msgid "Router" -msgstr "Маршрутизатор" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:74 -msgid "not found in network database" -msgstr "не найдено в сети баз данных" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:82 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:134 -msgid "Network Database Contents" -msgstr "База Данных Содержание" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:83 -msgid "View RouterInfo" -msgstr "Открыть Маршрутизатор Информация" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:84 -msgid "LeaseSets" -msgstr "АрендаНаборы" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92 -msgid "LeaseSet" -msgstr "АрендаНаборы" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:94 -msgid "Local" -msgstr "Локальный" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -msgid "Unpublished" -msgstr "Неопубликованные" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:97 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:104 -msgid "Destination" -msgstr "Направление" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:114 -#, java-format -msgid "Expires in {0}" -msgstr "Срок истекает в {0}" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:116 -#, java-format -msgid "Expired {0} ago" -msgstr "Истек {0} назад" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:118 -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:156 -msgid "Gateway" -msgstr "Шлюз" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:118 -msgid "Lease" -msgstr "Аренда" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:120 -msgid "Tunnel" -msgstr "Туннель" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:134 -msgid "View LeaseSets" -msgstr "Смотреть на Аренду-Наборы" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:136 -msgid "Not initialized" -msgstr "Не инициализируется" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:145 -msgid "Routers" -msgstr "Маршрутизаторы" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:147 -msgid "Show all routers" -msgstr "Показать все маршрутизаторы" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:149 -msgid "Show all routers with full stats" -msgstr "Показать все маршрутизаторы с полной статистики" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184 -msgid "Network Database Router Statistics" -msgstr "Сетевая База Данных Статистики Маршрутизатора" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:204 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:222 -msgid "Count" -msgstr "Количество" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 -msgid "Version" -msgstr "Версия" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:204 -msgid "Transports" -msgstr "Транспортные" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:222 -msgid "Country" -msgstr "Страна" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:254 -msgid "Our info" -msgstr "Наша информация" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:256 -msgid "Peer info for" -msgstr "Информация о пире" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:260 -msgid "Full entry" -msgstr "Полная запись" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:266 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:96 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:581 -msgid "Hidden" -msgstr "Скрыто" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:266 -msgid "Updated" -msgstr "Обновлено" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:267 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:270 -#, java-format -msgid "{0} ago" -msgstr "{0} назад" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:269 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:273 -msgid "Published" -msgstr "Опубликован" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:275 -msgid "Address(es)" -msgstr "Адреса" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:308 -msgid "Hidden or starting up" -msgstr "Скрытая или запуском" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:308 -msgid "SSU" -msgstr "SSU" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:308 -msgid "SSU with introducers" -msgstr "SSU с поручителями" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:309 -msgid "NTCP" -msgstr "NTCP" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:309 -msgid "NTCP and SSU" -msgstr "NTCP и SSU" - -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:309 -msgid "NTCP and SSU with introducers" -msgstr "NTCP и SSU с поручителями" - -#: ../java/src/net/i2p/router/web/NewsFetcher.java:80 -#, java-format -msgid "News last updated {0} ago." -msgstr "Новости Последнее обновление {0} назад." - -#: ../java/src/net/i2p/router/web/NewsFetcher.java:86 -#, java-format -msgid "News last checked {0} ago." -msgstr "Новости Последняя проверка: {0} назад." - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:72 -msgid "Peer Profiles" -msgstr "Профили Пиров" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:73 -#, java-format -msgid "Showing {0} recent profiles." -msgstr "Показаны {0} последних профилей." - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:75 -#, java-format -msgid "Hiding {0} older profiles." -msgstr "Сокрытие {0} взрослыми профилей." - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:77 -#, java-format -msgid "Hiding {0} standard profiles." -msgstr "Сокрытие {0} стандартных профилей." - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:82 -msgid "Groups (Caps)" -msgstr "Группы (Способности)" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:83 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:251 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:334 -msgid "Speed" -msgstr "Скорость" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:84 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:253 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:338 -msgid "Capacity" -msgstr "Способность" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:85 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:255 -msgid "Integration" -msgstr "Интеграция" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:86 -msgid "Status" -msgstr "Статус" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:126 -msgid "Fast, High Capacity" -msgstr "Быстрый, Высокая Производительная Мощность" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:127 -msgid "High Capacity" -msgstr "Высокая производительная мощность" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:128 -msgid "Standard" -msgstr "Стандартный" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:129 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:163 -msgid "Failing" -msgstr "В противном случае" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:249 -msgid "Integrated" -msgstr "Интегрированные" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:162 -msgid "Banned" -msgstr "Запрещена" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:164 -msgid "Unreachable" -msgstr "Недоступные" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:171 -msgid "Test Fails" -msgstr "Test Failures" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:175 -msgid "profile" -msgstr "профиль" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:184 -msgid "Floodfill and Integrated Peers" -msgstr "Floodfill и Интегрированные Пиры" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:188 -msgid "Caps" -msgstr "Предельные" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:189 -msgid "Integ. Value" -msgstr "Интегрированное значение" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:190 -msgid "Last Heard About" -msgstr "Последний Слышали О" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:191 -msgid "Last Heard From" -msgstr "Последний Раз Слышали От" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:192 -msgid "Last Good Send" -msgstr "Последний Хорошо Отправить" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:193 -msgid "Last Bad Send" -msgstr "Последний Плохо Отправить" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:194 -msgid "10m Resp. Time" -msgstr "10 мин. Время отклика" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:195 -msgid "1h Resp. Time" -msgstr "1 час Время отклика" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:196 -msgid "1d Resp. Time" -msgstr "1 день Время отклика" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:197 -msgid "Last Good Lookup" -msgstr "Последний Хороший Поиск" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:198 -msgid "Last Bad Lookup" -msgstr "Последний Плохо Поиска" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:199 -msgid "Last Good Store" -msgstr "Последний Хорошо Хранения" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200 -msgid "Last Bad Store" -msgstr "Последний Плохо Хранения" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:201 -msgid "1h Fail Rate" -msgstr "1ч Интенсивность Отказов" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202 -msgid "1d Fail Rate" -msgstr "1д Интенсивность Отказов" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:250 -msgid "Thresholds" -msgstr "Порог" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:252 -msgid "fast peers" -msgstr "быстрые пиры" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:254 -msgid "high capacity peers" -msgstr "пиры у которых высокая производительная мощность" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:256 -msgid " well integrated peers" -msgstr "хорошо интегрированные пиры" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:257 -msgid "Definitions" -msgstr "Определение" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:258 -msgid "as determined by the profile organizer" -msgstr "как определяется профилем организатор" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:258 -msgid "groups" -msgstr "группы" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 -msgid "capabilities in the netDb, not used to determine profiles" -msgstr "возможности в сетьБД, не используются для определения профилей" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 -msgid "caps" -msgstr "пределы" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 -msgid "peak throughput (bytes per second) over a 1 minute period that the peer has sustained in a single tunnel" -msgstr "Пик производительности (байт в секунду) в течение 1 минуты периода, что партнер имеет выдержанный в одном туннеле" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 -msgid "speed" -msgstr "скорость" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 -msgid "capacity" -msgstr "потенциала" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 -msgid "how many tunnels can we ask them to join in an hour?" -msgstr "cколько туннелей мы можем попросить их присоединиться к часу?" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 -msgid "how many new peers have they told us about lately?" -msgstr "сколько новых узлов не нам сказали последнее время?" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 -msgid "integration" -msgstr "интеграция" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 -msgid "is the peer banned, or unreachable, or failing tunnel tests?" -msgstr "это совокупность запрещены или недоступны, или не туннель тесты?" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 -msgid "status" -msgstr "статус" - -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:321 -msgid "n/a" -msgstr "не доступно" - -#: ../java/src/net/i2p/router/web/ShitlistRenderer.java:57 -#, java-format -msgid "Temporary ban expiring in {0}" -msgstr "Временного запрета истекает в {0}" - -#: ../java/src/net/i2p/router/web/ShitlistRenderer.java:59 -#, java-format -msgid "Banned until restart or in {0}" -msgstr "Запрещены до перезагрузку через {0}" - -#: ../java/src/net/i2p/router/web/ShitlistRenderer.java:71 -msgid "unban now" -msgstr "удалить запрета сейчас" - -#: ../java/src/net/i2p/router/web/StatsGenerator.java:58 -msgid "Statistics gathered during this router's uptime" -msgstr "Статистические данные, полученные во время проведенное на сайте этого маршрутизатора" - -#: ../java/src/net/i2p/router/web/StatsGenerator.java:61 -msgid "The data gathered is quantized over a 1 minute period, so should just be used as an estimate." -msgstr "Данные собраны квантуется более 1 минуты периода, поэтому следует использовать в качестве оценки." - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:40 -msgid "Configure startup of clients and webapps (services); manually start dormant services" -msgstr "Настройка запуска клиентов и Webapps (услуг); вручную запустить покоя услуги" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:42 -msgid "I2P Services" -msgstr "Сервисы I2P" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:48 -msgid "Manage your I2P hosts file here (I2P domain name resolution)" -msgstr "Управляйте своими I2P хостов файла здесь (I2P доменных имен)" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:50 -msgid "Addressbook" -msgstr "Адресная Книжка" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:54 -msgid "Built-in anonymous BitTorrent Client" -msgstr "Встроенные в анонимной загрузки клиента" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:56 -msgid "Torrents" -msgstr "Торренты" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:60 -msgid "Anonymous webmail client" -msgstr "Аноним электронной почтовый веб-клиент" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:62 -msgid "Webmail" -msgstr "Веб-Почта" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:66 -msgid "Anonymous resident webserver" -msgstr "Аноним сервер резидента" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:68 -msgid "Webserver" -msgstr "Веб-Сервер" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:72 -msgid "Configure I2P Router" -msgstr "Настройка Маршрутизатора I2P" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:74 -msgid "I2P Internals" -msgstr "Внутренняя Организация I2P" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:80 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:344 -msgid "View existing tunnels and tunnel build status" -msgstr "Просмотр существующих туннелей и туннелей построить статус" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:86 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 -msgid "Show all current peer connections" -msgstr "Показать все текущие подключения сверстников" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:92 -msgid "Show recent peer performance profiles" -msgstr "Показать последних профили производительности сверстников" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:94 -msgid "Profiles" -msgstr "Профили" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:98 -msgid "Show list of all known I2P routers" -msgstr "Показать список всех известных I2P маршрутизаторы" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:100 -msgid "NetDB" -msgstr "СетьДБ" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:104 -msgid "Health Report" -msgstr "Доклад о Состоянии Здравоохранения" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:106 -msgid "Logs" -msgstr "Логи" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:110 -msgid "Show the router's workload, and how it's performing" -msgstr "Показать нагрузку на маршрутизатор, и как это исполняющей" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:112 -msgid "Jobs" -msgstr "Задачи" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:116 -msgid "Graph router performance" -msgstr "График производительности маршрутизатора" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:118 -msgid "Graphs" -msgstr "Диаграммы" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 -msgid "Textual router performance statistics" -msgstr "Текстовое маршрутизатора статистики по эффективности" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:134 -msgid "I2P Router Help" -msgstr "I2P Помощь Маршрутизатор" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:136 -msgid "General" -msgstr "Общий" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 -msgid "Your unique I2P router identity is" -msgstr "Ваш уникальный I2P маршрутизатора идентичность" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:143 -msgid "never reveal it to anyone" -msgstr "никогда не показывайте его никому" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 -msgid "Local Identity" -msgstr "Локальный Адрес" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 -msgid "How long we've been running for this session" -msgstr "Как долго мы уже в течение этой сессии" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160 -msgid "Uptime" -msgstr "Аптайм" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:167 -msgid "Help with configuring your firewall and router for optimal I2P performance" -msgstr "Помощь в настройке брандмауэра и маршрутизатора для обеспечения оптимальной производительности I2P" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:194 -msgid "Download" -msgstr "Загрузка" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 -msgid "Download Unsigned" -msgstr "Загрузка Неподписанных" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 -msgid "Active" -msgstr "Активные" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:237 -msgid "Fast" -msgstr "Быстрые" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:243 -msgid "High capacity" -msgstr "Высокая производительная мощность" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:255 -msgid "Known" -msgstr "Общепризнанные" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -msgid "Help with firewall configuration" -msgstr "Помощь в настройке брандмауэра" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:272 -msgid "Check NAT/firewall" -msgstr "Проверка NAT/брандмауэры" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:292 -msgid "Reseed" -msgstr "Повтор Первой Сети Связи" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 -msgid "Configure router bandwidth allocation" -msgstr "Настройка маршрутизатора распределения пропускной способностью" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 -msgid "Bandwidth in/out" -msgstr "Пропускная способность входящего / выходящего" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 -msgid "Total" -msgstr "Всего" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:336 -msgid "Used" -msgstr "Колич." - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 -msgid "Tunnels in/out" -msgstr "Туннели входящие / выходящие " - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 -msgid "Exploratory" -msgstr "Разведочные" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -msgid "Participating" -msgstr "Участвующие" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 -msgid "What's in the router's job queue?" -msgstr "Что в очереди заданий маршрутизатор?" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:375 -msgid "Congestion" -msgstr "Перегрузка" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:380 -msgid "Job lag" -msgstr "Задержка задачи" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:386 -msgid "Message delay" -msgstr "Задержка доставки сообщения" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:392 -msgid "Tunnel lag" -msgstr "Задержка туннеля" - -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:398 -msgid "Backlog" -msgstr "Очередь" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:73 -msgid "skew" -msgstr "отклонение" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:92 -msgid "ERR-Client Manager I2CP Error - check logs" -msgstr "ОШИБКА-менеджер клиентов I2CP ошибка - проверьте журналы" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:94 -msgid "ERR-ClockSkew" -msgstr "ОШИБКА-ЧасиОтклонение" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:103 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:557 -msgid "OK" -msgstr "ОК" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:104 -msgid "ERR-Private TCP Address" -msgstr "ОШИБКА Частные TCP-адрес" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:106 -msgid "ERR-SymmetricNAT" -msgstr "ОШИБКА - Симметричный-NAT" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:109 -msgid "WARN-Firewalled with Inbound TCP Enabled" -msgstr "ПРЕДУПРЕЖДЕНИЕ-файрвол с Входящий TCP Включено" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:111 -msgid "WARN-Firewalled and Floodfill" -msgstr "ПРЕДУПРЕЖДЕНИЕ-файрволл и Floodfill" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:113 -msgid "WARN-Firewalled and Fast" -msgstr "ПРЕДУПРЕЖДЕНИЕ-файрволл и быстро" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:114 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:561 -msgid "Firewalled" -msgstr "За Брандмауэром" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:116 -msgid "ERR-UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and restart" -msgstr "ОШИБКА UDP-порта в использовании - Задать i2np.udp.internalPort=xxxx Расширенный конфигурации и перезапустить" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:123 -msgid "ERR-UDP Disabled and Inbound TCP host/port not set" -msgstr "ERROR-UDP Disabled and Inbound TCP host/port not set" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:125 -msgid "WARN-Firewalled with UDP Disabled" -msgstr "ПРЕДУПРЕЖДЕНИЕ-файрвол с UDP для инвалидов" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:127 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:577 -msgid "Testing" -msgstr "Проверка" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:360 -msgid "Add/remove/edit & control your client and server tunnels" -msgstr "Добавлять / удалять / редактировать и управлять вашим клиентом и сервером туннелей" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:360 -msgid "Local Destinations" -msgstr "Локальные Пункты Назначения" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:369 -msgid "Server" -msgstr "Сервер" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:373 -msgid "Show tunnels" -msgstr "Показать туннелей" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:384 -msgid "Leases expired" -msgstr "Срока аренды" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:384 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:385 -msgid "Rebuilding" -msgstr "Восстановление" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:385 -msgid "ago" -msgstr "назад" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:388 -msgid "Ready" -msgstr "Готовый" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:392 -msgid "Building" -msgstr "Строительство" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:392 -msgid "Building tunnels" -msgstr "Строительство туннелей" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:404 -#: ../java/strings/Strings.java:36 -msgid "shared clients" -msgstr "общие клиенты" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:40 -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:62 -msgid "configure" -msgstr "конфигурировать" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:64 -msgid "dead" -msgstr "мертвый" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70 -msgid "Participating tunnels" -msgstr "Участвующие туннели" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71 -msgid "From" -msgstr "От" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71 -msgid "Receive on" -msgstr "Получить на" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 -msgid "Expiration" -msgstr "Истечение срока" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 -msgid "Send on" -msgstr "Отправить по" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 -msgid "To" -msgstr "К" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73 -msgid "Rate" -msgstr "Ставка" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73 -msgid "Role" -msgstr "Роль" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73 -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:156 -msgid "Usage" -msgstr "Использование" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:107 -msgid "grace period" -msgstr "льготный период" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:117 -msgid "Outbound Endpoint" -msgstr "Исходящие Конечная точка" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:119 -msgid "Inbound Gateway" -msgstr "Inbound Сетевой Шлюз" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:121 -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 -msgid "Participant" -msgstr "Участник" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:126 -msgid "Inactive participating tunnels" -msgstr "Неактивные участвующие туннелей" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:127 -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:216 -msgid "Lifetime bandwidth usage" -msgstr "Использование долговечной пропускной способности входящего канала" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:156 -msgid "Expiry" -msgstr "Истечение Срока" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:156 -msgid "In/Out" -msgstr "Входящего / Выходящего" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:159 -msgid "Participants" -msgstr "Участники" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:165 -msgid "Endpoint" -msgstr "Конечная Точка" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:205 -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211 -msgid "Build in progress" -msgstr "Опираясь на данном моменте" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:205 -msgid "inbound" -msgstr "входящий" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211 -msgid "outbound" -msgstr "исходящий" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:215 -msgid "No tunnels; waiting for the grace period to end." -msgstr "Нет туннелях, ожидая льготного периода и до конца." - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:216 -msgid "in" -msgstr "входящий" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:217 -msgid "out" -msgstr "исходящий" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:234 -msgid "Tunnel Counts By Peer" -msgstr "Тоннель графов По Пиру" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:235 -msgid "% of total" -msgstr "% всего" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:235 -msgid "Expl. + Client" -msgstr "Разведочной + Клиентский" - -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:235 -msgid "Part. from + to" -msgstr "Participating from + to" - -#: ../java/strings/Strings.java:12 -msgid "addressbook" -msgstr "адресная книжка" - -#: ../java/strings/Strings.java:13 -msgid "i2psnark" -msgstr "i2psnark" - -#: ../java/strings/Strings.java:14 -msgid "i2ptunnel" -msgstr "i2p-туннель" - -#: ../java/strings/Strings.java:15 -msgid "susimail" -msgstr "susi-почта" - -#: ../java/strings/Strings.java:16 -msgid "susidns" -msgstr "susidns" - -#: ../java/strings/Strings.java:17 -msgid "routerconsole" -msgstr "маршрутизатор-консоли" - -#: ../java/strings/Strings.java:22 -msgid "Web console" -msgstr "Веб-консоль" - -#: ../java/strings/Strings.java:23 -msgid "SAM application bridge" -msgstr "Мост приложения SAM" - -#: ../java/strings/Strings.java:24 -msgid "Application tunnels" -msgstr "Применение туннелей" - -#: ../java/strings/Strings.java:25 -msgid "My eepsite web server" -msgstr "Мой веб-сервер «eepsite»" - -#: ../java/strings/Strings.java:26 -msgid "I2P webserver (eepsite)" -msgstr "Мой веб-сервер «eepsite»" - -#: ../java/strings/Strings.java:27 -msgid "Browser launch at startup" -msgstr "Запуск браузера при запуске I2P" - -#: ../java/strings/Strings.java:28 -msgid "BOB application bridge" -msgstr "Мост приложения BOB" - -#: ../java/strings/Strings.java:30 -msgid "Open Router Console in web browser at startup" -msgstr "Открыть консоль маршрутизатора в веб-браузере при запуске" - -#: ../java/strings/Strings.java:37 -msgid "IRC proxy" -msgstr "IRC прокси" - -#: ../java/strings/Strings.java:38 -msgid "eepsite" -msgstr "eepsite" - -#: ../java/strings/Strings.java:39 -msgid "I2P webserver" -msgstr "I2P web-server" - -#: ../java/strings/Strings.java:40 -msgid "HTTP Proxy" -msgstr "HTTP Прокси" - -#: ../java/strings/Strings.java:42 -msgid "eepProxy" -msgstr "eep-Прокси" - -#: ../java/strings/Strings.java:43 -msgid "ircProxy" -msgstr "irc-Прокси" - -#: ../java/strings/Strings.java:45 -msgid "I2PSnark" -msgstr "I2PSnark" - -#: ../java/strings/Strings.java:47 -msgid "iMule" -msgstr "iMule" - -#: ../java/strings/Strings.java:51 -msgid "classic" -msgstr "классическая" - -#: ../java/strings/Strings.java:52 -msgid "dark" -msgstr "темная" - -#: ../java/strings/Strings.java:53 -msgid "light" -msgstr "светлая" - -#: ../java/strings/Strings.java:54 -msgid "midnight" -msgstr "полуночная" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:106 -msgid "config networking" -msgstr "конфигурация сети" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:217 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:218 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:217 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:217 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:231 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:217 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:217 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:218 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:217 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:217 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:217 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:220 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:228 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:217 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:220 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/index_jsp.java:223 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:216 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:216 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:216 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:220 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:216 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:216 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:216 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:236 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:216 -msgid "Refresh (s)" -msgstr "Обновить (сек)" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:221 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:222 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:221 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:221 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:235 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:221 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:221 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:222 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:221 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:221 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:221 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:224 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:232 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:221 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:224 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/index_jsp.java:227 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:220 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:220 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:220 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:224 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:220 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:220 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:220 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:239 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:220 -msgid "Enable" -msgstr "Включать" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:241 -msgid "I2P Network Configuration" -msgstr "I2P Настройке Сети" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:297 -msgid "Bandwidth limiter" -msgstr "Ограничитель диапазона частот" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:299 -msgid "I2P will work best if you configure your rates to match the speed of your internet connection." -msgstr "I2P будет работать лучше, если Вы настроите частоту для подбора соответствующей скорости подсоединения к Интернету." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:303 -msgid "KBps In" -msgstr "Кбит/сек Загруженное" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:317 -msgid "KBps Out" -msgstr "Кбит/сек Закаченное" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:333 -msgid "Share" -msgstr "Поделено" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:340 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:307 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:303 -msgid "NOTE" -msgstr "ЗАМЕТЬТЕ" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:342 -#, java-format -msgid "You have configured I2P to share only {0} KBps." -msgstr "Вы настроили протокол I2P, чтоб использовать только {0} килобит информации за секунду." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:345 -msgid "I2P requires at least 12KBps to enable sharing. " -msgstr "I2P требует, по крайней мере 12KBps чтобы поделить трафик. " - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:346 -msgid "Please enable sharing (participating in tunnels) by configuring more bandwidth. " -msgstr "Пожалуйста, включите поделен трафик (участие в туннелях), настроя больше пропускной способностью. " - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:347 -msgid "It improves your anonymity by creating cover traffic, and helps the network." -msgstr "Это улучшает вашу анонимность создавая покрытия трафика, а также помогает в сети." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:350 -#, java-format -msgid "You have configured I2P to share {0} KBps." -msgstr "Вы настроили протокол I2P, чтоб использовать {0} килобит информации за секунду." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:353 -msgid "The higher the share bandwidth the more you improve your anonymity and help the network." -msgstr "Чем больше пропускная способность входящего/исходящего канала расшаренного ресурса, тем больше Вы поддерживаете анонимность и тем самым помогаете сети." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:359 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:496 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:305 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:324 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:335 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:375 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:343 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:323 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:356 -msgid "Cancel" -msgstr "Отклонить изменения" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:363 -msgid "IP and Transport Configuration" -msgstr "IP и конфигурации транспорта" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:365 -msgid "The default settings will work for most people." -msgstr "Настройки по умолчанию будет работать для большинства людей." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:367 -msgid "There is help below." -msgstr "Дополнительную информацию смотрите ниже:" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:369 -msgid "UPnP Configuration" -msgstr "Конфигурация UPnP" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:373 -msgid "Enable UPnP to open firewall ports" -msgstr "Запустите UPnP, чтоб открыть порты брандмауэра" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:375 -msgid "UPnP status" -msgstr "статус UPnP" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:377 -msgid "IP Configuration" -msgstr "IP Конфигурация" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:379 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:441 -msgid "Externally reachable hostname or IP address" -msgstr "Внешне достижимое имя хоста или IP -адрес" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:383 -msgid "Use all auto-detect methods" -msgstr "Используйте все методы автоматического опознавания" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:387 -msgid "Disable UPnP IP address detection" -msgstr "Отключите детектор IP-адреса UPnP" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:391 -msgid "Ignore local interface IP address" -msgstr "Отклоните IP адрес локального интерфейса." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:395 -msgid "Use SSU IP address detection only" -msgstr "Используйте только детектор IP- адреса SSU" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:399 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:459 -msgid "Specify hostname or IP" -msgstr "Установите имя хоста или IP" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:405 -msgid "Select Interface" -msgstr "Выбирать Интерфейс" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:419 -msgid "Hidden mode - do not publish IP" -msgstr "Скрытый метод – не разглашайте IP адрес" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:421 -msgid "(prevents participating traffic)" -msgstr "(препятствует причастному трафику)" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:423 -msgid "UDP Configuration:" -msgstr "UDP Конфигурация" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:425 -msgid "UDP port:" -msgstr "UDP Порт:" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:439 -msgid "TCP Configuration" -msgstr "TCP Конфигурация" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:445 -msgid "Use auto-detected IP address" -msgstr "Используйте только автоматически распознанный IP -адрес" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:447 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -msgid "currently" -msgstr "в настоящее время" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:451 -msgid "if we are not firewalled" -msgstr "если есть доступ к порту." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:455 -msgid "Always use auto-detected IP address (Not firewalled)" -msgstr "Всегда используйте только автоматически распознанный IP-адрес (а не адрес брандмауэра)" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:465 -msgid "Disable inbound (Firewalled)" -msgstr "Отключите входящие (за брандмауэром)" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:469 -msgid "Completely disable" -msgstr "Полностью отключите" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:471 -msgid "(select only if behind a firewall that throttles or blocks outbound TCP)" -msgstr "(выберете, только если брандмауэр тормозит работу или блокирует выходные данные протокола управления передачей данных)" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:473 -msgid "Externally reachable TCP port" -msgstr "Внешне достижимый порт протокола TCP" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:477 -msgid "Use the same port configured for UDP" -msgstr "Используйте тот же порт, настроенный для протокола UDP" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:485 -msgid "Specify Port" -msgstr "Определите Порт" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:489 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:342 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:329 -msgid "Note" -msgstr "Заметьте" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:492 -msgid "Changing these settings will restart your router." -msgstr "При изменении настроек, происходит перезагрузка маршрутизатора." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:498 -msgid "Configuration Help" -msgstr "Помощь конфигурации" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:500 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:549 -msgid "While I2P will work fine behind most firewalls, your speeds and network integration will generally improve if the I2P port is forwarded for both UDP and TCP." -msgstr "Хотя I2P будет прекрасно работать позади большинства брандмауэров, ваша скорость и сетевой интеграции, вероятно, улучшится, если порт I2P направляется для UDP и TCP." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:502 -msgid "If you can, please poke a hole in your firewall to allow unsolicited UDP and TCP packets to reach you." -msgstr "Если можно, сделайте, пожалуйста, отверстие в брандмауэре, чтоб самостоятельно предоставленные UDP и TCP-пакеты могли дойти до Вас." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:504 -msgid "If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole punching with \"SSU introductions\" to relay traffic." -msgstr "Если не можете, I2P поспособствует тому, чтоб UPnP (набор сетевых протоколов) и отверстие в UDP, проделанное «применением SSU» переключили трафик." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:506 -msgid "Most of the options above are for special situations, for example where UPnP does not work correctly, or a firewall not under your control is doing harm." -msgstr "Множество из перечисленных опций предназначены для использования в отдельных ситуациях, к примеру, где UPnP работает неверно, или брандмауэр находится вне контроля и причиняет вред." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:508 -msgid "Certain firewalls such as symmetric NATs may not work well with I2P." -msgstr "Некоторые брадмауэры, к примеру, симметричные NAT-устройствам (преобразования сетевых адресов) могут и «не сработаться» с I2P." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:517 -msgid "UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect the external IP address and forward ports." -msgstr "UPnP используется для связи с интернет-шлюзом (IGDs), чтоб определять внешний IP-адрес и передовые порты." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:519 -msgid "UPnP support is beta, and may not work for any number of reasons" -msgstr "Поддержка UPnP не испробована, и может не работать по нескольким причинам" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:521 -msgid "No UPnP-compatible device present" -msgstr "Отсутствие UPnP- существующее совместимое устройство" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:523 -msgid "UPnP disabled on the device" -msgstr "Выключенный UPnP в устройстве" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:525 -msgid "Software firewall interference with UPnP" -msgstr "Взаимодействие программного обеспечения брандмауэра с UPnP" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:527 -msgid "Bugs in the device's UPnP implementation" -msgstr "Ошибки при внедрении устройства UPnP" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:529 -msgid "Multiple firewall/routers in the internet connection path" -msgstr "Разнообразные брандмауэры/маршрутизаторы в способах подсоединения к интернету" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:531 -msgid "UPnP device change, reset, or address change" -msgstr "Замена устройства UPnP, перезагрузка или изменение адреса" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:533 -msgid "Review the UPnP status here." -msgstr "Обзор статуса UPnP здесь." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:535 -msgid "UPnP may be enabled or disabled above, but a change requires a router restart to take effect." -msgstr "UPnP может быть включено или отключено, но для получения желательного результата изменения требуется перезагрузка маршрутизатора." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:537 -msgid "Hostnames entered above will be published in the network database." -msgstr "Имена хоста, зарегистрированные выше, будут опубликованы в базе данных сети." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:539 -msgid "They are not private." -msgstr "Они не являются личными." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:541 -msgid "Also, do not enter a private IP address like 127.0.0.1 or 192.168.1.1." -msgstr "Также, не запишите личный IP-адрес, как 127.0.0.1 или 192.168.1.1." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:543 -msgid "If you specify the wrong IP address or hostname, or do not properly configure your NAT or firewall, your network performance will degrade substantially." -msgstr "Если Вы установите неправильный IP-адрес или имя хоста, или неправильно сконфигурируете Ваше NAT-устройство или брандмауэр, работа сети будет существенно ухудшаться." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:545 -msgid "When in doubt, leave the settings at the defaults." -msgstr "Если Вы сомневаетесь, не заходите на настройки." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:547 -msgid "Reachability Help" -msgstr "Помощь доступности" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:552 -msgid "If you think you have opened up your firewall and I2P still thinks you are firewalled, remember that you may have multiple firewalls, for example both software packages and external hardware routers." -msgstr "Если Вы думаете, что открыли Ваш брандмауэр, а протокол I2P все еще думает, что доступа к порту нет, помните, что у Вас могут быть различные брандмауэры, то есть,- и программное обеспечение, и внешние маршрутизаторы аппаратного обеспечения." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:555 -msgid "If there is an error, the logs may also help diagnose the problem." -msgstr "Если обнаружится ошибка, текстовые файлы (logs) могут помочь раскрыть сущность проблемы." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:559 -msgid "Your UDP port does not appear to be firewalled." -msgstr "Ваш UDP порт не закрыт" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:563 -msgid "Your UDP port appears to be firewalled." -msgstr "Ваш UDP-порт закрыт. Кажеться что ваш UDP порт за брандмауером." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:565 -msgid "As the firewall detection methods are not 100% reliable, this may occasionally be displayed in error." -msgstr "Поскольку методы детектирования брандмауэра не надежны на 100 %, может случайно обнаружиться ошибка." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:567 -msgid "However, if it appears consistently, you should check whether both your external and internal firewalls are open for your port." -msgstr "Однако, если окажется, последовательно, Вы должны убедиться, как внешний и внутренний брандмауэр открыт для вашего порта." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:569 -msgid "I2P will work fine when firewalled, there is no reason for concern. When firewalled, the router uses \"introducers\" to relay inbound connections." -msgstr "Сеть заработает должным образом, если будет закрыт порт, причин для беспокойства нет. Когда доступа к порту нет, маршрутизатор использует «устройство ввода», чтоб ретранслировать входящее соединение." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:571 -msgid "However, you will get more participating traffic and help the network more if you can open your firewall(s)." -msgstr "Несмотря на это, Вы получите больше сетевого трафика и тем самым поможете работе сети при условии, если откроете брандмауэры." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:573 -msgid "If you think you have already done so, remember that you may have both a hardware and a software firewall, or be behind an additional, institutional firewall you cannot control." -msgstr "Если думаете, что Вы все сделали правильно, помните, что у Вас может быть как аппаратное, так и программное оборудование, и что в обходе дополнительного, основного брандмауэра, Вы не можете контролировать." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:575 -msgid "Also, some routers cannot correctly forward both TCP and UDP on a single port, or may have other limitations or bugs that prevent them from passing traffic through to I2P." -msgstr "Также некоторые маршрутизаторы не могут правильно отсылать TCP и UDP протоколы на один порт, или же они могут иметь иные ограничения или вирусы, которые препятствуют прохождению трафика в I2P." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:579 -msgid "The router is currently testing whether your UDP port is firewalled." -msgstr "Маршрутизатор проверяет, закрыт ли Ваш UDP порт." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:583 -msgid "The router is not configured to publish its address, therefore it does not expect incoming connections." -msgstr "Маршрутизатор не конфигурируется для публикации адреса, поэтому он не ожидает входящего соединения." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:585 -msgid "WARN - Firewalled and Fast" -msgstr "ПРЕДУПРЕЖДЕНИЕ - За Брандмауэром и Быстрый" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:587 -msgid "You have configured I2P to share more than 128KBps of bandwidth, but you are firewalled." -msgstr "Вы сконфигурировали протокол I2P, чтоб использовать более, чем 128 килобайт в секунду диапазона частоты, но доступа к порту нет." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:589 -msgid "While I2P will work fine in this configuration, if you really have over 128KBps of bandwidth to share, it will be much more helpful to the network if you open your firewall." -msgstr "Хотя сеть будет должным образом работать в этой конфигурации, если Вы действительно имеете для совместного использования более 128 килобайт в секунду диапазона частот, будет лучше для сети, если б Вы открыли брандмауэр." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:591 -msgid "WARN - Firewalled and Floodfill" -msgstr "ПРЕДУПРЕЖДЕНИЕ - За Брандмауэром и Floodfill" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:593 -msgid "You have configured I2P to be a floodfill router, but you are firewalled." -msgstr "Вы настроили I2P быть floodfill маршрутизатора, но маршрутизатор за брандмауэром." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:595 -msgid "For best participation as a floodfill router, you should open your firewall." -msgstr "Для лучшей совместной работы в качестве floodfill маршрутизатора, Вы должны открыть свой брандмауэр." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:597 -msgid "WARN - Firewalled with Inbound TCP Enabled" -msgstr "ПРЕДУПРЕЖДЕНИЕ - За Брандмауэром и Входящий TCP Включено" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:599 -msgid "You have configured inbound TCP, however your UDP port is firewalled, and therefore it is likely that your TCP port is firewalled as well." -msgstr "Вы сконфигурировали входящий TCP, однако Ваш UDP порт закрыт, поэтому скорее всего Ваш TCP – порт так же закрыт." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:601 -msgid "If your TCP port is firewalled with inbound TCP enabled, routers will not be able to contact you via TCP, which will hurt the network." -msgstr "Если Ваш TCP порт закрыт входящим включенным TCP, маршрутизаторы не смогут соединиться с Вами через TCP, т.к. могут повредить сеть." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:603 -msgid "Please open your firewall or disable inbound TCP above." -msgstr "Пожалуйста, откройте свой брандмауэр или отключенный входящий порт TCP." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:605 -msgid "WARN - Firewalled with UDP Disabled" -msgstr "ПРЕДУПРЕЖДЕНИЕ - За Брандмауэром и UDP Отключенный" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:607 -msgid "You have configured inbound TCP, however you have disabled UDP." -msgstr "Вы сконфигурировали входящий TCP, но все равно Вы отключили UDP." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:609 -msgid "You appear to be firewalled on TCP, therefore your router cannot accept inbound connections." -msgstr "Вы firewalled on TCP, поэтому Ваш маршрутизатор не может принять входящие соединения." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:611 -msgid "Please open your firewall or enable UDP." -msgstr "Пожалуйста, откройте свой брандмауер или закройте UDP." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:613 -msgid "ERR - Clock Skew" -msgstr "ОШИБКА - Часы Отклонение" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:615 -msgid "Your system's clock is skewed, which will make it difficult to participate in the network." -msgstr "Вашы часы системного времени сбились, что усложнит работу в сети." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:617 -msgid "Correct your clock setting if this error persists." -msgstr "Настройте часы, если эта ошибка не исчезает." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:619 -msgid "ERR - Private TCP Address" -msgstr "ОШИБКА - Частный TCP Адрес" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:621 -msgid "You must never advertise an unroutable IP address such as 127.0.0.1 or 192.168.1.1 as your external address." -msgstr "Нельзя разглашать немаршрутизируемый IP –адрес, как 127.0.0.1 или 192.168.1.1 в качестве Вашего внешнего адреса." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:623 -msgid "Correct the address or disable inbound TCP above." -msgstr "Исправьте адрес или отключите входящий TCP сверх." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:625 -msgid "ERR - SymmetricNAT" -msgstr "ОШИБКА - симметрическим NAT" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:627 -msgid "I2P detected that you are firewalled by a Symmetric NAT." -msgstr "I2P определила, что порт был закрыт симметрическим NAT." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:629 -msgid "I2P does not work well behind this type of firewall. You will probably not be able to accept inbound connections, which will limit your participation in the network." -msgstr "I2P не работает должным образом из-за отсутствия доступа к порту. Возможно, Вы не сможете принять входящее соединение, которое будет ограничивать доступ к сети." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:631 -msgid "ERR - UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and restart" -msgstr "ОШИБКА - UDP-порта уже используется - Настройте i2np.udp.internalPort=xxxx в advanced config и перезагрузите" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:633 -msgid "I2P was unable to bind to port 8887 or other configured port." -msgstr "I2P не мог подсоединиться к порту 8887 или к другому конфигурируемому порту." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:635 -msgid "Check to see if another program is using the configured port. If so, stop that program or configure I2P to use a different port." -msgstr "Проверьте что другая программа использует настроенный порт. Если да, то остановить программу или настроить I2P использовать другой порт." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:637 -msgid "This may be a transient error, if the other program is no longer using the port." -msgstr "Может произойти сбой, если другая программа больше не использует этот порт." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:639 -msgid "However, a restart is always required after this error." -msgstr "Однако после такой ошибки всегда требуется перезагрузка." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:641 -msgid "ERR - UDP Disabled and Inbound TCP host/port not set" -msgstr "ОШИБКА - UDP отключен и входящий TCP / порт не указан" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:643 -msgid "You have not configured inbound TCP with a hostname and port above, however you have disabled UDP." -msgstr "Вы не сконфигурировали входящий TCP с именем хоста и выше указанным портом, но все равно Вы отключили UDP." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:645 -msgid "Therefore your router cannot accept inbound connections." -msgstr "Следовательно Ваш маршрутизатор не может принять входящее соединение." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:647 -msgid "Please configure a TCP host and port above or enable UDP." -msgstr "Пожалуйста, сконфигурируйте хост TCP и выше указанный порт или же включите UDP." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:649 -msgid "ERR - Client Manager I2CP Error - check logs" -msgstr "ОШИБКА - Менеджер Клиентов I2CP Ошибка - проверьте текстовые файлы (logs)" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:651 -msgid "This is usually due to a port 7654 conflict. Check the logs to verify." -msgstr "Обычно это обусловлено конфликтом порта 7654 (ошибка). Проверьте текстовые файлы (logs), чтоб удостовериться." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:653 -msgid "Do you have another I2P instance running? Stop the conflicting program and restart I2P." -msgstr "У Вас есть другое выполнение запроса через протокол I2P? Остановите эту программу и перезагрузите I2P." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:107 -msgid "config advanced" -msgstr "расширенные настройки" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:242 -msgid "I2P Advanced Configuration" -msgstr "I2P Расширенные Настройки" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:299 -msgid "Advanced I2P Configuration" -msgstr "Расширенные I2P Настройки" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:303 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:321 -msgid "Apply" -msgstr "Применить" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:309 -msgid "Some changes may require a restart to take effect." -msgstr "Может потребоваться перезагрузка системы для того, чтобы некоторые изменения вступили в силу." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:106 -msgid "config clients" -msgstr "настройка клиента" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:241 -msgid "I2P Client Configuration" -msgstr "I2P Настройка Клиента" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:306 -msgid "Client Configuration" -msgstr "Настройка Клиента" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:308 -msgid "The Java clients listed below are started by the router and run in the same JVM." -msgstr "Java-клиенты, приведенные ниже, запускаются маршрутизатором и действуют в одной и той же Java-машине." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:312 -msgid "To change other client options, edit the file" -msgstr "Для того, чтобы изменить другие пользовательские настройки, выполните редактирование файла" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:319 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:331 -msgid "All changes require restart to take effect." -msgstr "Для того, чтобы данные изменения вступили в силу, выполните перезагрузку I2P." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:323 -msgid "WebApp Configuration" -msgstr "WebApp Конфигурация" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:325 -msgid "The Java web applications listed below are started by the webConsole client and run in the same JVM as the router. They are usually web applications accessible through the router console. They may be complete applications (e.g. i2psnark),front-ends to another client or application which must be separately enabled (e.g. susidns, i2ptunnel), or have no web interface at all (e.g. addressbook)." -msgstr "Веб-приложения Java, перечисленные ниже, запускаются при помощи консольного клиента с веб-интерфейсом и действуют в той же Java-машине, что и маршрутизатор. Обычно это веб-приложения, доступные через консоль маршрутизатора. Они могут быть полными (например, i2psnark), обеспечивающими взаимодействие с внешними клиентами или приложениями, которые должны быть запущены отдельно (например, susidns, i2ptunnel), или же такими, которые не имеют интерфейса вообще (например, addressbook)." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:327 -msgid "A web app may also be disabled by removing the .war file from the webapps directory; however the .war file and web app will reappear when you update your router to a newer version, so disabling the web app here is the preferred method." -msgstr "Веб-приложение также можно блокировать посредством удаления файла с расширением .war из папки webappsс веб-приложениями; тем не менее, файл с расширением .war и веб-приложение появятся, когда вы обновите маршрутизатор до более новой версии, так что блокировка веб-приложения является предпочтительной." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:106 -msgid "config keyring" -msgstr "конфигурация для устройств хранения данных" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:228 -msgid "I2P Keyring Configuration" -msgstr "Конфигурация I2P Для Устройств Хранения Данных" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:294 -msgid "The router keyring is used to decrypt encrypted leaseSets." -msgstr "Устройство хранения данных маршрутизатора используется для расшифровки зашифрованных наборов адресов." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:297 -msgid "The keyring may contain keys for local or remote encrypted destinations." -msgstr "На устройстве могут содержаться ключи для локальных или удаленных адресов зашифрованных назначений." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:307 -msgid "Manual Keyring Addition" -msgstr "Ручное Дополнение К Накопителю Информации" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:309 -msgid "Enter keys for encrypted remote destinations here." -msgstr "Введите ключи для зашифрованных удаленных адресов." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:312 -msgid "Keys for local destinations must be entered on the" -msgstr "Ключи для локальных адресов назначения необходимо ввести на" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:314 -msgid "I2PTunnel page" -msgstr "странице I2PTunnel" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:316 -msgid "Dest. name, hash, or full key" -msgstr "Имя адреса назначения, хэш или полный ключ" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:318 -msgid "Encryption Key" -msgstr "Криптографический ключ" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:107 -msgid "config logging" -msgstr "настройка журнала" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:242 -msgid "I2P Logging Configuration" -msgstr "I2P Настройке Журнала" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:299 -msgid "Configure I2P Logging Options" -msgstr "Опции Записи Конфигурации I2P" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:301 -msgid "Logging filename" -msgstr "Имя файла записи" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:305 -msgid "(the symbol '@' will be replaced during log rotation)" -msgstr "(символ «@» будет заменен в процессе сканирования записи)" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:307 -msgid "Log record format" -msgstr "Формат записи системного журнала" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:311 -msgid "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)" -msgstr "(используйте следующие обозначения: «d» = дата, «c» = класс, «t» = тред, «p» = приоритет, «m» = сообщение)" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:313 -msgid "Log date format" -msgstr "Формат даты записи" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:317 -msgid "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' = millisecond)" -msgstr "(«MM» = месяц, «dd» = день, «HH» = часы, «mm» = минуты, «ss» = секунды, «SSS» = миллисекунды)" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:319 -msgid "Max log file size" -msgstr "Максимальный размер файла системного журнала" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:323 -msgid "Default log level" -msgstr "Уровень записи по умолчанию" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:327 -msgid "(DEBUG and INFO are not recommended defaults, as they will drastically slow down your router)" -msgstr "(настройки DEBUG и INFO не являются рекомендованными по умолчанию, так как они значительно замедляют работу маршрутизатора)" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:329 -msgid "Log level overrides" -msgstr "Редактирование уровня записи" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:106 -msgid "config peers" -msgstr "конфигурация пиров" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:228 -msgid "I2P Peer Configuration" -msgstr "Конфигурация Пиров I2P" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:304 -msgid "Manual Peer Controls" -msgstr "Ручное Управление Пирами" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:306 -msgid "Router Hash" -msgstr "Хэш Маршрутизатора" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:310 -msgid "Manually Ban / Unban a Peer" -msgstr "ручную запретить / разрешить пиры" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:312 -msgid "Banning will prevent the participation of this peer in tunnels you create." -msgstr "Запрет предотвратит участие данного пира в созданных вами туннелях." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:324 -msgid "Bonuses may be positive or negative, and affect the peer's inclusion in Fast and High Capacity tiers. Fast peers are used for client tunnels, and High Capacity peers are used for some exploratory tunnels. Current bonuses are displayed on the" -msgstr "Дополнительные потоки могут быть как положительными и отрицательными, оказывающими влияние на вовлечение узлов сети в быстрых узлах и узлах большой мощност. Быстрые узлы используются для клиентских туннелей, а узлы большой мощности используются в некоторых типах поисковых туннелей. Текущие потоки отображены на" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:326 -msgid "profiles page" -msgstr "странице профилей" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:342 -msgid "Adjust peer bonuses" -msgstr "Настройка дополнительных потоков пиров" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:344 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:253 -msgid "Banned Peers" -msgstr "Запрещенные Пиры" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:366 -msgid "Banned IPs" -msgstr "Запрещенные IP адресы" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:106 -msgid "config service" -msgstr "конфигурация сервиса" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:228 -msgid "I2P Service Configuration" -msgstr "Конфигурация Сервиса I2P" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:284 -msgid "Shutdown the router" -msgstr "Выключить маршрутизатор" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:286 -msgid "Graceful shutdown lets the router satisfy the agreements it has already made before shutting down, but may take a few minutes." -msgstr "Постепенное выключение позволяет маршрутизатору выполнить запланированные задания до его выключения, но это займет несколько минут." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:288 -msgid "If you need to kill the router immediately, that option is available as well." -msgstr "Постепенное выключение позволяет маршрутизатору выполнить запланированные задания до его выключения, но это займет несколько минут." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:298 -msgid "If you want the router to restart itself after shutting down, you can choose one of the following." -msgstr "Если Вы хотите, чтоб маршрутизатор перезагрузился после выключения, Вы можете выбрать одно из действий." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:300 -msgid "This is useful in some situations" -msgstr "В некоторых случаях это полезно" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:302 -msgid "for example, if you changed some settings that client applications only read at startup, such as the routerconsole password or the interface it listens on." -msgstr "к примеру, если Вы поменяли некоторые настройки, которые приложения-клиенты читают только при запуске, такие как пароль консоля маршрутизатора или прослушивание интерфейса." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:304 -msgid "A graceful restart will take a few minutes (but your peers will appreciate your patience), while a hard restart does so immediately." -msgstr "Постепенное выключение будет длиться несколько минут (но твои пиры будут благодарны за твое терпение), а жесткая перезагрузка делает это незамедлительно." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:306 -msgid "After tearing down the router, it will wait 1 minute before starting back up again." -msgstr "После разбора настройки маршрутизатора, пройдет еще 1 минута до загрузки." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:316 -msgid "Systray integration" -msgstr "Система лоток интеграции" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:318 -msgid "On the windows platform, there is a small application to sit in the system tray, allowing you to view the router's status" -msgstr "На платформе Windows, есть небольшое приложение, чтобы сидеть в системном трее, что позволяет Вам просматривать статус маршрутизатора" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:320 -msgid "(later on, I2P client applications will be able to integrate their own functionality into the system tray as well)." -msgstr "(позднее, I2P приложений клиент сможет интегрировать свои функции в системном трее тоже)" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:322 -msgid "If you are on windows, you can either enable or disable that icon here." -msgstr "Если вы на Windows, вы можете включить или отключить этот значок здесь." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:328 -msgid "Run on startup" -msgstr "Запуск при старте" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:330 -msgid "You can control whether I2P is run on startup or not by selecting one of the following options" -msgstr "Вы можете управлять ли I2P запускается при запуске или не выбрать один из следующих вариантов" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:332 -msgid "I2P will install (or remove) a service accordingly." -msgstr "I2P будет установить (или удалить) услуга, соответственно." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:334 -msgid "If you prefer the command line, you can also run the " -msgstr "Если вы предпочитаете командную строку, вы можете также запустить " - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:344 -msgid "If you are running I2P as service right now, removing it will shut down your router immediately." -msgstr "Если вы используете I2P как сервис на данный момент, удалив будет закрыта маршрутизатор немедленно." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:346 -msgid "You may want to consider shutting down gracefully, as above, then running uninstall_i2p_service_winnt.bat." -msgstr "Вы можете рассмотреть вопрос о закрытии грациозно, как указано выше, затем запустить uninstall_i2p_service_winnt.bat." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:354 -msgid "Debugging" -msgstr "Отладка программы" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:360 -msgid "Launch browser on router startup?" -msgstr "Загружать браузер при запуске маршрутизатора?" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:362 -msgid "I2P's main configuration interface is this web console, so for your convenience I2P can launch a web browser on startup pointing at" -msgstr "Основной интерфейс конфигурации I2P таки веб-консоли, поэтому для вашего удобства I2P может открыть веб-браузер при запуске указывая на" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:107 -msgid "config stats" -msgstr "конфигурации статистики" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:229 -msgid "I2P Stats Configuration" -msgstr "Конфигурация Статистики I2P" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:300 -msgid "Configure I2P Stat Collection" -msgstr "Конфигурация Сбора Статистики I2P" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:302 -msgid "Enable full stats?" -msgstr "Активировать полную статистику?" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:309 -msgid "change requires restart to take effect" -msgstr "для того, чтобы изменения вступили в силу, необходима перезагрузка системы" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:311 -msgid "Stat file" -msgstr "Файл статистики" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:315 -msgid "Filter" -msgstr "Фильтр" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:317 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:326 -msgid "toggle all" -msgstr "переключить все" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:328 -msgid "Log" -msgstr "Запись" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:330 -msgid "Graph" -msgstr "Диаграмма" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:369 -msgid "Advanced filter" -msgstr "Дополнительные фильтры" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:106 -msgid "config tunnels" -msgstr "конфигурация туннеля" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:241 -msgid "I2P Tunnel Configuration" -msgstr "Конфигурация Туннеля I2P" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:305 -msgid "The default settings work for most people." -msgstr "Стандартные настройки действуют в большинстве случаев." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:309 -msgid "There is a fundamental tradeoff between anonymity and performance." -msgstr "Необходимо сделать выбор между анонимностью и производительностью." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:312 -msgid "Tunnels longer than 3 hops (for example 2 hops + 0-2 hops, 3 hops + 0-1 hops, 3 hops + 0-2 hops), or a high quantity + backup quantity, may severely reduce performance or reliability." -msgstr "Туннели, длина которых составляет более 3 хопов (например, 2 хопа + 0-2 хопа, 3 хопа + 0-1 хоп, 3 хопа + 0-2 хопа), или большое количество + резервное количество, могут значительно уменьшить производительность или надежность." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:315 -msgid "High CPU and/or high outbound bandwidth usage may result." -msgstr "Это также может привести к перегрузке ЦП и/или ухудшению пропускной способности входящего канала." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:318 -msgid "Change these settings with care, and adjust them if you have problems." -msgstr "Будьте внимательны при изменении данных настроек, урегулируйте их в том случае, если возникнут какие-либо проблемы." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:332 -msgid "Exploratory tunnel setting changes are stored in the router.config file." -msgstr "Разведочный туннель изменений параметров хранятся в файле router.config." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:335 -msgid "Client tunnel changes are temporary and are not saved." -msgstr "Клиент туннель изменения являются временными и не сохраняются." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:337 -msgid "To make permanent client tunnel changes see the" -msgstr "Для постоянных клиентов изменения туннеля см." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:339 -msgid "i2ptunnel page" -msgstr "i2ptunnel страницу" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:106 -msgid "config UI" -msgstr "конфигурации интерфейса" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:241 -msgid "I2P UI Configuration" -msgstr "I2P Настройка Пользовательского Интерфейса" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:291 -msgid "Router Console Theme" -msgstr "Тема Консоля Маршрутизатора" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:309 -msgid "Theme selection disabled for Internet Explorer, sorry." -msgstr "Выбор тем отключена для Internet Explorer, извините." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:311 -msgid "If you're not using IE, it's likely that your browser is pretending to be IE; please configure your browser (or proxy) to use a different User Agent string if you'd like to access the console themes." -msgstr "Если вы не используете IE, то, скорее всего, ваш браузер притворяется IE, пожалуйста, настроить Ваш браузер (или прокси-сервера), чтобы использовать различные User Agent String, если вы хотите получить доступ к консоли темам." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:315 -msgid "Router Console Language" -msgstr "Язык Маршрутизатора Консоля" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:319 -msgid "Please contribute to the router console translation project! Contact the developers on IRC #i2p to help." -msgstr "Пожалуйста, помогите маршрутизатор консоли проект по переводу! Свяжете с разработчиками на IRC # I2P помочь." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:106 -msgid "config update" -msgstr "обновленная конфигурация" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:228 -msgid "I2P Update Configuration" -msgstr "Обновленная Конфигурация I2P" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:300 -msgid "Check for I2P and news updates" -msgstr "Проверьте данные I2P и обновление новостей" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:302 -msgid "News & I2P Updates" -msgstr "Новости и Обновление I2P" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:306 -msgid "Update In Progress" -msgstr "Выполняется обновление" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:314 -msgid "News URL" -msgstr "Новости URL" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:318 -msgid "Refresh frequency" -msgstr "Частота обновления" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:322 -msgid "Update policy" -msgstr "Обновление конфигурации" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:326 -msgid "Update through the eepProxy?" -msgstr "Обновление через eep-Прокси?" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:330 -msgid "eepProxy host" -msgstr "eep-Прокси хост" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:334 -msgid "eepProxy port" -msgstr "eep-Прокси порт" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:338 -msgid "Update URLs" -msgstr "Обновления URL-адресы" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:342 -msgid "Trusted keys" -msgstr "Доверенные криптографические ключи" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:346 -msgid "Update with unsigned development builds?" -msgstr "Обновить беззнаковой тестовой сборкой?" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:350 -msgid "Unsigned Build URL" -msgstr "Беззнаковая тестовая сборка URL" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:354 -msgid "Save" -msgstr "Сохранить" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:117 -msgid "Page Not Found" -msgstr "Страница Не Найдена" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:243 -msgid "Sorry! You appear to be requesting a non-existent Router Console page or resource." -msgstr "Извините! Вы, как представляется, с просьбой о несуществующих Маршрутизатор консоли страницы или ресурса." - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:245 -msgid "Error 404" -msgstr "Ошибка 404" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:250 -msgid "not found" -msgstr "не найдено" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:106 -msgid "graphs" -msgstr "диаграммы" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:228 -msgid "I2P Performance Graphs" -msgstr "I2P Диаграммы Производительности" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/index_jsp.java:105 -msgid "home" -msgstr "дома" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:105 -msgid "job queue" -msgstr "очереди заданий" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:227 -msgid "I2P Router Job Queue" -msgstr "Маршрутизатор I2P Очередь Заданий" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:105 -msgid "logs" -msgstr "логи" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:227 -msgid "I2P Router Logs" -msgstr "I2P Маршрутизатор Логи" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:229 -msgid "I2P Version & Running Environment" -msgstr "I2P Версии & Действуюшая Окружающей Среды" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:231 -msgid "Please include this information in bug reports" -msgstr "Пожалуйста, включите эту информацию в докладах ошибка" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:105 -msgid "network database summary" -msgstr "база данных резюме" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:227 -msgid "I2P Network Database Summary" -msgstr "I2P База Данных Резюме" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:105 -msgid "peer connections" -msgstr "связи пиров" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:227 -msgid "I2P Network Peers" -msgstr "I2P Сеть Пиры" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:105 -msgid "peer profiles" -msgstr "профили пиров" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:227 -msgid "I2P Network Peer Profiles" -msgstr "Профили Пиров Сети I2P" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:105 -msgid "statistics" -msgstr "статистика" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:242 -msgid "I2P Router Statistics" -msgstr "I2P Маршрутизатор Статистика" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:245 -#, java-format -msgid "Disable {0}s Refresh" -msgstr "Откл. {0}с. Обновление" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:105 -msgid "tunnel summary" -msgstr "туннель резюме" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:227 -msgid "I2P Tunnel Summary" -msgstr "I2P Тоннеля Резюме" - diff --git a/history.txt b/history.txt index c8e1794e1..749f8d370 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +2009-12-06 zzz + * netdb.jsp: Fix bug caused by XSS fix + * Translations: drop ru until after release + 2009-12-05 zzz * Build: Fix poupdate dependency * Console: Add Russian option diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 1e23e3feb..9314b6e7f 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 27; + public final static long BUILD = 28; /** for example "-test" */ public final static String EXTRA = "-rc"; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; From deae0e88569fbc5e93abff2dcc5a7f44b7cd300f Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 7 Dec 2009 21:24:03 +0000 Subject: [PATCH 045/127] truncate the history in the updater --- build.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index f2e27b1df..f078c7bc2 100644 --- a/build.xml +++ b/build.xml @@ -287,7 +287,8 @@ - + + + + + + + + + + From fb21fb25eeade127fff5cd40233658979ad52cdc Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 7 Dec 2009 21:25:27 +0000 Subject: [PATCH 046/127] * I2PTunnel: - Switch all I2PThreads to I2PAppThreads - Run an InternalSocket as well for the HTTP Proxy * EepGet: Use InternalSocket * Console: Change "depth" to "length" --- .../i2ptunnel/HTTPResponseOutputStream.java | 4 +- .../i2p/i2ptunnel/I2PTunnelClientBase.java | 10 ++-- .../i2p/i2ptunnel/I2PTunnelHTTPClient.java | 23 ++++++++ .../i2p/i2ptunnel/I2PTunnelHTTPServer.java | 6 +- .../net/i2p/i2ptunnel/I2PTunnelIRCClient.java | 6 +- .../net/i2p/i2ptunnel/I2PTunnelRunner.java | 6 +- .../net/i2p/i2ptunnel/I2PTunnelServer.java | 8 +-- .../java/src/net/i2p/i2ptunnel/I2Ping.java | 6 +- .../i2p/i2ptunnel/InternalSocketRunner.java | 55 +++++++++++++++++++ .../net/i2p/i2ptunnel/TunnelController.java | 4 +- .../i2p/i2ptunnel/TunnelControllerGroup.java | 4 +- apps/i2ptunnel/jsp/editClient.jsp | 6 +- apps/i2ptunnel/jsp/editServer.jsp | 4 +- .../i2p/router/web/ConfigTunnelsHelper.java | 2 +- core/java/src/net/i2p/util/EepGet.java | 3 +- .../java/src/net/i2p/util/InternalSocket.java | 20 ++++--- 16 files changed, 126 insertions(+), 41 deletions(-) create mode 100644 apps/i2ptunnel/java/src/net/i2p/i2ptunnel/InternalSocketRunner.java diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java index 12940a81b..de71ff3b2 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java @@ -20,7 +20,7 @@ import java.util.zip.GZIPInputStream; import net.i2p.I2PAppContext; import net.i2p.data.ByteArray; import net.i2p.util.ByteCache; -import net.i2p.util.I2PThread; +import net.i2p.util.I2PAppThread; import net.i2p.util.Log; /** @@ -219,7 +219,7 @@ class HTTPResponseOutputStream extends FilterOutputStream { //out.flush(); PipedInputStream pi = new PipedInputStream(); PipedOutputStream po = new PipedOutputStream(pi); - new I2PThread(new Pusher(pi, out), "HTTP decompresser").start(); + new I2PAppThread(new Pusher(pi, out), "HTTP decompresser").start(); out = po; } diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java index 6a6c83883..a7197a006 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java @@ -27,7 +27,7 @@ import net.i2p.client.streaming.I2PSocketManagerFactory; import net.i2p.client.streaming.I2PSocketOptions; import net.i2p.data.Destination; import net.i2p.util.EventDispatcher; -import net.i2p.util.I2PThread; +import net.i2p.util.I2PAppThread; import net.i2p.util.Log; import net.i2p.util.SimpleScheduler; import net.i2p.util.SimpleTimer; @@ -153,7 +153,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna } // else delay creating session until createI2PSocket() is called - Thread t = new I2PThread(this); + Thread t = new I2PAppThread(this); t.setName("Client " + _clientId); listenerReady = false; t.start(); @@ -207,7 +207,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna for (int i = 0; i < _numConnectionBuilders; i++) { String name = "ClientBuilder" + _clientId + '.' + i; - I2PThread b = new I2PThread(new TunnelConnectionBuilder(), name); + I2PAppThread b = new I2PAppThread(new TunnelConnectionBuilder(), name); b.setDaemon(true); b.start(); } @@ -350,7 +350,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna * called by derived classes after initialization. * */ - public final void startRunning() { + public void startRunning() { synchronized (startLock) { startRunning = true; startLock.notify(); @@ -490,7 +490,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna protected void manageConnection(Socket s) { if (s == null) return; if (_numConnectionBuilders <= 0) { - new I2PThread(new BlockingRunner(s), "Clinet run").start(); + new I2PAppThread(new BlockingRunner(s), "Clinet run").start(); return; } diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java index b729b659b..683c9d6aa 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java @@ -233,6 +233,29 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable return opts; } + private InternalSocketRunner isr; + + /** + * Actually start working on incoming connections. + * Overridden to start an internal socket too. + * + */ + @Override + public void startRunning() { + super.startRunning(); + this.isr = new InternalSocketRunner(this); + } + + /** + * Overridden to close internal socket too. + */ + public boolean close(boolean forced) { + boolean rv = super.close(forced); + if (this.isr != null) + this.isr.stopRunning(); + return rv; + } + private static final boolean DEFAULT_GZIP = true; // all default to false public static final String PROP_REFERER = "i2ptunnel.httpclient.sendReferer"; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java index e1ce9084e..af9f1c1ec 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java @@ -17,7 +17,7 @@ import java.util.zip.GZIPOutputStream; import net.i2p.client.streaming.I2PSocket; import net.i2p.data.DataHelper; import net.i2p.util.EventDispatcher; -import net.i2p.util.I2PThread; +import net.i2p.util.I2PAppThread; import net.i2p.util.Log; import net.i2p.data.Base32; @@ -118,7 +118,7 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer { useGZIP = true; if (allowGZIP && useGZIP) { - I2PThread req = new I2PThread(new CompressedRequestor(s, socket, modifiedHeader), Thread.currentThread().getName()+".hc"); + I2PAppThread req = new I2PAppThread(new CompressedRequestor(s, socket, modifiedHeader), Thread.currentThread().getName()+".hc"); req.start(); } else { new I2PTunnelRunner(s, socket, slock, null, modifiedHeader.getBytes(), null); @@ -174,7 +174,7 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer { _log.info("request headers: " + _headers); serverout.write(_headers.getBytes()); browserin = _browser.getInputStream(); - I2PThread sender = new I2PThread(new Sender(serverout, browserin, "server: browser to server"), Thread.currentThread().getName() + "hcs"); + I2PAppThread sender = new I2PAppThread(new Sender(serverout, browserin, "server: browser to server"), Thread.currentThread().getName() + "hcs"); sender.start(); browserout = _browser.getOutputStream(); diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java index b194ab702..007652673 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java @@ -14,7 +14,7 @@ import net.i2p.client.streaming.I2PSocket; import net.i2p.data.DataFormatException; import net.i2p.data.Destination; import net.i2p.util.EventDispatcher; -import net.i2p.util.I2PThread; +import net.i2p.util.I2PAppThread; import net.i2p.util.Log; public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable { @@ -83,9 +83,9 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable i2ps = createI2PSocket(clientDest); i2ps.setReadTimeout(readTimeout); StringBuilder expectedPong = new StringBuilder(); - Thread in = new I2PThread(new IrcInboundFilter(s,i2ps, expectedPong), "IRC Client " + __clientId + " in"); + Thread in = new I2PAppThread(new IrcInboundFilter(s,i2ps, expectedPong), "IRC Client " + __clientId + " in"); in.start(); - Thread out = new I2PThread(new IrcOutboundFilter(s,i2ps, expectedPong), "IRC Client " + __clientId + " out"); + Thread out = new I2PAppThread(new IrcOutboundFilter(s,i2ps, expectedPong), "IRC Client " + __clientId + " out"); out.start(); } catch (Exception ex) { if (_log.shouldLog(Log.ERROR)) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java index 76480a940..446ad5563 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java @@ -16,10 +16,10 @@ import net.i2p.client.streaming.I2PSocket; import net.i2p.data.ByteArray; import net.i2p.util.ByteCache; import net.i2p.util.Clock; -import net.i2p.util.I2PThread; +import net.i2p.util.I2PAppThread; import net.i2p.util.Log; -public class I2PTunnelRunner extends I2PThread implements I2PSocket.SocketErrorListener { +public class I2PTunnelRunner extends I2PAppThread implements I2PSocket.SocketErrorListener { private final static Log _log = new Log(I2PTunnelRunner.class); private static volatile long __runnerId; @@ -222,7 +222,7 @@ public class I2PTunnelRunner extends I2PThread implements I2PSocket.SocketErrorL } } - private class StreamForwarder extends I2PThread { + private class StreamForwarder extends I2PAppThread { InputStream in; OutputStream out; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java index 76246d7b6..2471fcc50 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java @@ -24,7 +24,7 @@ import net.i2p.client.streaming.I2PSocketManager; import net.i2p.client.streaming.I2PSocketManagerFactory; import net.i2p.data.Base64; import net.i2p.util.EventDispatcher; -import net.i2p.util.I2PThread; +import net.i2p.util.I2PAppThread; import net.i2p.util.Log; public class I2PTunnelServer extends I2PTunnelTask implements Runnable { @@ -132,7 +132,7 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable { * */ public void startRunning() { - Thread t = new I2PThread(this); + Thread t = new I2PAppThread(this); t.setName("Server " + (++__serverId)); t.start(); } @@ -204,7 +204,7 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable { I2PServerSocket i2pS_S = sockMgr.getServerSocket(); int handlers = getHandlerCount(); for (int i = 0; i < handlers; i++) { - I2PThread handler = new I2PThread(new Handler(i2pS_S), "Handle Server " + i); + I2PAppThread handler = new I2PAppThread(new Handler(i2pS_S), "Handle Server " + i); handler.start(); } } else { @@ -213,7 +213,7 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable { try { final I2PSocket i2ps = i2pS_S.accept(); if (i2ps == null) throw new I2PException("I2PServerSocket closed"); - new I2PThread(new Runnable() { public void run() { blockingHandle(i2ps); } }).start(); + new I2PAppThread(new Runnable() { public void run() { blockingHandle(i2ps); } }).start(); } catch (I2PException ipe) { if (_log.shouldLog(Log.ERROR)) _log.error("Error accepting - KILLING THE TUNNEL SERVER", ipe); diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java index 1f358abf0..a3cd1ad99 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java @@ -14,7 +14,7 @@ import net.i2p.I2PException; import net.i2p.client.streaming.I2PSocketManager; import net.i2p.data.Destination; import net.i2p.util.EventDispatcher; -import net.i2p.util.I2PThread; +import net.i2p.util.I2PAppThread; import net.i2p.util.Log; public class I2Ping extends I2PTunnelTask implements Runnable { @@ -59,7 +59,7 @@ public class I2Ping extends I2PTunnelTask implements Runnable { sockMgr = I2PTunnelClient.getSocketManager(tunnel); } } - Thread t = new I2PThread(this); + Thread t = new I2PAppThread(this); t.setName("Client"); t.start(); open = true; @@ -188,7 +188,7 @@ public class I2Ping extends I2PTunnelTask implements Runnable { } } - public class PingHandler extends I2PThread { + public class PingHandler extends I2PAppThread { private String destination; public PingHandler(String dest) { diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/InternalSocketRunner.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/InternalSocketRunner.java new file mode 100644 index 000000000..5e3eefd4f --- /dev/null +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/InternalSocketRunner.java @@ -0,0 +1,55 @@ +package net.i2p.i2ptunnel; + +import java.io.IOException; +import java.net.ServerSocket; +import java.net.Socket; + +import net.i2p.util.I2PAppThread; +import net.i2p.util.InternalServerSocket; +import net.i2p.util.Log; + +/** + * Listen for in-JVM connections on the internal "socket" + * + * @author zzz + */ +class InternalSocketRunner implements Runnable { + private I2PTunnelClientBase client; + private int port; + private ServerSocket ss; + private boolean open; + private static final Log _log = new Log(InternalSocketRunner.class); + + /** starts the runner */ + InternalSocketRunner(I2PTunnelClientBase client) { + this.client = client; + this.port = client.getLocalPort(); + Thread t = new I2PAppThread(this, "Internal socket port " + this.port, true); + t.start(); + } + + public final void run() { + try { + this.ss = new InternalServerSocket(this.port); + this.open = true; + while (true) { + Socket s = this.ss.accept(); + this.client.manageConnection(s); + } + } catch (IOException ex) { + if (this.open) { + _log.error("Error listening for internal connections on " + this.port, ex); + } + this.open = false; + } + } + + void stopRunning() { + if (this.open) { + try { + this.ss.close(); + } catch (IOException ex) {} + this.open = false; + } + } +} diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java index b5ca6c3a1..06beffae5 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java @@ -16,7 +16,7 @@ import net.i2p.client.I2PClientFactory; import net.i2p.client.I2PSession; import net.i2p.data.Base32; import net.i2p.data.Destination; -import net.i2p.util.I2PThread; +import net.i2p.util.I2PAppThread; import net.i2p.util.Log; /** @@ -106,7 +106,7 @@ public class TunnelController implements Logging { public void startTunnelBackground() { if (_running) return; _starting = true; - new I2PThread(new Runnable() { public void run() { startTunnel(); } }).start(); + new I2PAppThread(new Runnable() { public void run() { startTunnel(); } }).start(); } /** diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java index fb330679a..4250dedd0 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java @@ -18,7 +18,7 @@ import net.i2p.I2PAppContext; import net.i2p.client.I2PSession; import net.i2p.client.I2PSessionException; import net.i2p.data.DataHelper; -import net.i2p.util.I2PThread; +import net.i2p.util.I2PAppThread; import net.i2p.util.Log; /** @@ -94,7 +94,7 @@ public class TunnelControllerGroup { _controllers.add(controller); i++; } - I2PThread startupThread = new I2PThread(new StartControllers(), "Startup tunnels"); + I2PAppThread startupThread = new I2PAppThread(new StartControllers(), "Startup tunnels"); startupThread.start(); if (_log.shouldLog(Log.INFO)) diff --git a/apps/i2ptunnel/jsp/editClient.jsp b/apps/i2ptunnel/jsp/editClient.jsp index c0ad7cdb5..67452919d 100644 --- a/apps/i2ptunnel/jsp/editClient.jsp +++ b/apps/i2ptunnel/jsp/editClient.jsp @@ -205,9 +205,9 @@
        - <% int tunnelDepth = editBean.getTunnelDepth(curTunnel, 2); %> @@ -222,7 +222,7 @@ - <% int tunnelVariance = editBean.getTunnelVariance(curTunnel, 0); %> diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp index 958c7e8b1..610b68a51 100644 --- a/apps/i2ptunnel/jsp/editServer.jsp +++ b/apps/i2ptunnel/jsp/editServer.jsp @@ -172,9 +172,9 @@
        - <% int tunnelDepth = editBean.getTunnelDepth(curTunnel, 2); %> diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java index 108b94e52..2be5a4a00 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java @@ -84,7 +84,7 @@ public class ConfigTunnelsHelper extends HelperBase { // buf.append("
      \n"); // tunnel depth - buf.append("\n"); + buf.append("\n"); buf.append("\n\n\n\n\n\n"); + out.write("\n"); for (int i = 0; i < snarks.size(); i++) { Snark snark = (Snark)snarks.get(i); @@ -133,8 +171,13 @@ public class I2PSnarkServlet extends HttpServlet { boolean showPeers = showDebug || "1".equals(peerParam) || Base64.encode(snark.meta.getInfoHash()).equals(peerParam); displaySnark(out, snark, uri, i, stats, showPeers, showDebug); } + if (snarks.size() <= 0) { - out.write(TABLE_EMPTY); + out.write("" + + "\n"); } else if (snarks.size() > 1) { out.write("\n" + " \n"); + if(showPeers && isRunning && curPeers > 0) { List peers = snark.coordinator.peerList(); Iterator it = peers.iterator(); @@ -578,11 +642,11 @@ public class I2PSnarkServlet extends HttpServlet { out.write(""); out.write("\n\t"); - out.write("\n"); } else if (snarks.size() > 1) { out.write("\n" + - " \n" + + " \n" + " \n" + " \n" + " \n" + diff --git a/apps/i2psnark/locale/messages_de.po b/apps/i2psnark/locale/messages_de.po index fd52fbb81..d2915b6e3 100644 --- a/apps/i2psnark/locale/messages_de.po +++ b/apps/i2psnark/locale/messages_de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P i2psnark\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-09 20:35+0000\n" +"POT-Creation-Date: 2009-12-09 23:27+0000\n" "PO-Revision-Date: 2009-10-19 12:50+0000\n" "Last-Translator: foo \n" "Language-Team: foo \n" @@ -26,7 +26,7 @@ msgid "Refresh page" msgstr "" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:97 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:649 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:653 msgid "I2PSnark" msgstr "" @@ -86,101 +86,257 @@ msgstr "" msgid "No torrents loaded." msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:514 -msgid "Seeding" +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:184 +msgid "Totals" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:521 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:523 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:186 +#, java-format +msgid "{0} torrents" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:189 +#, java-format +msgid "{0} connected peers" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:224 +#, java-format +msgid "Torrent file {0} does not exist" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:234 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:916 +#, java-format +msgid "Torrent already running: {0}" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:236 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:918 +#, java-format +msgid "Torrent already in the queue: {0}" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:240 +#, java-format +msgid "Copying torrent to {0}" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:243 +#, java-format +msgid "Unable to copy the torrent to {0}" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:243 +#, java-format +msgid "from {0}" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:251 +#, java-format +msgid "Fetching {0}" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:255 +msgid "Invalid URL - must start with http://" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:285 +#, java-format +msgid "Starting up torrent {0}" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:305 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:323 +#, java-format +msgid "Torrent file deleted: {0}" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:329 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:339 +#, java-format +msgid "Data file deleted: {0}" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:331 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:341 +#, java-format +msgid "Data file could not be deleted: {0}" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:350 +#, java-format +msgid "Data dir deleted: {0}" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:381 +msgid "Error creating torrent - you must select a tracker" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:396 +#, java-format +msgid "Torrent created for {0}" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:399 +#, java-format +msgid "" +"Many I2P trackers require you to register new torrents before seeding - " +"please do so before starting {0}" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:401 +#, java-format +msgid "Error creating a torrent for {0}" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:404 +#, java-format +msgid "Cannot create a torrent for the nonexistent data: {0}" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:407 +msgid "Error creating torrent - you must enter a file or directory" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:410 +msgid "Stopping all torrents and closing the I2P tunnel." +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:419 +msgid "I2P tunnel closed." +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:422 +msgid "Opening the I2P tunnel and starting all torrents." +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:499 +msgid "Unknown" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:502 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:506 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 +msgid "TrackerErr" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:504 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:506 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:516 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:525 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:527 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:529 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:531 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:533 msgid "peers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:516 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:514 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:518 +msgid "Seeding" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:520 msgid "Complete" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:519 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:523 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:527 msgid "OK" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:525 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:529 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:533 msgid "Stalled" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:531 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535 msgid "No Peers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:533 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 msgid "Stopped" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:546 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:550 msgid "View files" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:548 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:552 msgid "Open file" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:573 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:576 +msgid "Tracker" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:577 msgid "Details" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:607 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:611 msgid "Stop the torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:609 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:613 msgid "Stop" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:619 msgid "Start the torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:621 msgid "Start" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:622 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:626 msgid "Remove the torrent from the active list, deleting the .torrent file" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:624 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628 msgid "Remove" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:632 msgid "Delete the .torrent file and the associated data file(s)" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:634 msgid "Delete" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:677 msgid "Seed" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:691 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:695 msgid "Uninteresting" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:693 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:697 msgid "Choked" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:707 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:711 msgid "Uninterested" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:709 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:713 msgid "Choking" msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:897 +#, java-format +msgid "Torrent fetched from {0}" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:924 +#, java-format +msgid "Torrent at {0} was not valid" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:929 +#, java-format +msgid "Torrent was not retrieved from {0}" +msgstr "" From 9af796a10a949ee0d21f1d96c87b67ce3dcd4bf5 Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 10 Dec 2009 01:06:55 +0000 Subject: [PATCH 057/127] translation support --- apps/i2ptunnel/java/bmsg.sh | 17 ++++ apps/i2ptunnel/java/build.xml | 41 ++++++++- apps/i2ptunnel/java/bundle-messages.bat | 26 ++++++ apps/i2ptunnel/java/bundle-messages.sh | 88 +++++++++++++++++++ .../src/net/i2p/i2ptunnel/web/Messages.java | 37 ++++++++ apps/i2ptunnel/jsp/editClient.jsp | 3 +- apps/i2ptunnel/jsp/editServer.jsp | 3 +- apps/i2ptunnel/jsp/index.jsp | 3 +- apps/i2ptunnel/locale/messages_de.po | 30 +++++++ build.xml | 1 + 10 files changed, 242 insertions(+), 7 deletions(-) create mode 100644 apps/i2ptunnel/java/bmsg.sh create mode 100644 apps/i2ptunnel/java/bundle-messages.bat create mode 100755 apps/i2ptunnel/java/bundle-messages.sh create mode 100644 apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/Messages.java create mode 100644 apps/i2ptunnel/locale/messages_de.po diff --git a/apps/i2ptunnel/java/bmsg.sh b/apps/i2ptunnel/java/bmsg.sh new file mode 100644 index 000000000..b9d294b32 --- /dev/null +++ b/apps/i2ptunnel/java/bmsg.sh @@ -0,0 +1,17 @@ +# +# Update messages_xx.po and messages_xx.class files, +# from both java and jsp sources. +# Requires installed programs xgettext, msgfmt, msgmerge, and find. +# zzz - public domain +# + +## launching sh.exe with -login parameter will open a shell with the current path always pointing to \bin\ +## need to cd into our orignal path - where we call sh.exe from. + +cd $CALLFROM +## echo $PWD + +## except this everything is the same with bundle-message.sh +## walking - public domain :-D + +source bundle-messages.sh $PARAS \ No newline at end of file diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml index a74e328cc..fa3e5d677 100644 --- a/apps/i2ptunnel/java/build.xml +++ b/apps/i2ptunnel/java/build.xml @@ -42,12 +42,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -113,11 +150,7 @@ - - - - diff --git a/apps/i2ptunnel/java/bundle-messages.bat b/apps/i2ptunnel/java/bundle-messages.bat new file mode 100644 index 000000000..90feca972 --- /dev/null +++ b/apps/i2ptunnel/java/bundle-messages.bat @@ -0,0 +1,26 @@ +@echo off +set Callfrom=%cd% +set Paras=%1 + +rem before calling make sure you have msys and mingw 's "bin" path +rem in your current searching path +rem type "set path" to check +if not exist ..\locale\*.only goto updateALL + +rem put a messages_xx.only(eg messages_zh.only) into locale folder +rem this script will only touch the po file(eg zh) you specified, leaving other po files untact. + +for %%i in (..\locale\*.only) do set PO=%%~ni +echo [Notice] Yu choose to Ony update the choosen file: %PO%.po +for %%i in (..\locale\*.po) do if not %%~ni==%PO% ren %%i %%~ni.po- + +call sh --login %cd%\bmsg.sh + +for %%i in (..\locale\*.po-) do if not %%~ni==%PO% ren %%i %%~ni.po +goto end + +:updateALL +call sh --login %cd%\bmsg.sh + +:end +echo End of Message Bundling \ No newline at end of file diff --git a/apps/i2ptunnel/java/bundle-messages.sh b/apps/i2ptunnel/java/bundle-messages.sh new file mode 100755 index 000000000..b4f694b71 --- /dev/null +++ b/apps/i2ptunnel/java/bundle-messages.sh @@ -0,0 +1,88 @@ +# +# Update messages_xx.po and messages_xx.class files, +# from both java and jsp sources. +# Requires installed programs xgettext, msgfmt, msgmerge, and find. +# +# usage: +# bundle-messages.sh (generates the resource bundle from the .po file) +# bundle-messages.sh -p (updates the .po file from the source tags, then generates the resource bundle) +# +# zzz - public domain +# +CLASS=net.i2p.i2ptunnel.web.messages +TMPFILE=build/javafiles.txt +export TZ=UTC + +if [ "$1" = "-p" ] +then + POUPDATE=1 +fi + +# add ../java/ so the refs will work in the po file +JPATHS="../java/src ../jsp/WEB-INF" +for i in ../locale/messages_*.po +do + # get language + LG=${i#../locale/messages_} + LG=${LG%.po} + + if [ "$POUPDATE" = "1" ] + then + # make list of java files newer than the .po file + find $JPATHS -name *.java -newer $i > $TMPFILE + fi + + if [ -s build/obj/net/i2p/i2ptunnel/messages_$LG.class -a \ + build/obj/net/i2p/i2ptunnel/messages_$LG.class -nt $i -a \ + ! -s $TMPFILE ] + then + continue + fi + + if [ "$POUPDATE" = "1" ] + then + echo "Updating the $i file from the tags..." + # extract strings from java and jsp files, and update messages.po files + # translate calls must be one of the forms: + # _("foo") + # _x("foo") + # intl._("foo") + # intl.title("foo") + # In a jsp, you must use a helper or handler that has the context set. + # To start a new translation, copy the header from an old translation to the new .po file, + # then ant distclean updater. + find $JPATHS -name *.java > $TMPFILE + xgettext -f $TMPFILE -F -L java --from-code=UTF-8 \ + --keyword=_ --keyword=_x --keyword=intl._ --keyword=intl.title \ + -o ${i}t + if [ $? -ne 0 ] + then + echo 'Warning - xgettext failed, not updating translations' + rm -f ${i}t + break + fi + msgmerge -U --backup=none $i ${i}t + if [ $? -ne 0 ] + then + echo 'Warning - msgmerge failed, not updating translations' + rm -f ${i}t + break + fi + rm -f ${i}t + # so we don't do this again + touch $i + fi + + echo "Generating ${CLASS}_$LG ResourceBundle..." + + # convert to class files in build/obj + msgfmt --java -r $CLASS -l $LG -d build/obj $i + if [ $? -ne 0 ] + then + echo 'Warning - msgfmt failed, not updating translations' + break + fi +done +rm -f $TMPFILE +# todo: return failure +exit 0 diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/Messages.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/Messages.java new file mode 100644 index 000000000..fa3839232 --- /dev/null +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/Messages.java @@ -0,0 +1,37 @@ +package net.i2p.i2ptunnel.web; + +import net.i2p.I2PAppContext; +import net.i2p.util.Translate; + +/** + * Translate strings for this package. + */ +public class Messages { + private static final String BUNDLE_NAME = "net.i2p.i2ptunnel.messages"; + private final I2PAppContext _context; + + public Messages() { + _context = I2PAppContext.getGlobalContext(); + } + + /** lang in routerconsole.lang property, else current locale */ + public String _(String key) { + return Translate.getString(key, _context, BUNDLE_NAME); + } + + /** + * translate a string with a parameter + * This is a lot more expensive than getString(s, ctx), so use sparingly. + * + * @param s string to be translated containing {0} + * The {0} will be replaced by the parameter. + * Single quotes must be doubled, i.e. ' -> '' in the string. + * @param o parameter, not translated. + * To tranlslate parameter also, use _("foo {0} bar", _("baz")) + * Do not double the single quotes in the parameter. + * Use autoboxing to call with ints, longs, floats, etc. + */ + public String _(String s, Object o) { + return Translate.getString(s, o, _context, BUNDLE_NAME); + } +} diff --git a/apps/i2ptunnel/jsp/editClient.jsp b/apps/i2ptunnel/jsp/editClient.jsp index 67452919d..40d1028b0 100644 --- a/apps/i2ptunnel/jsp/editClient.jsp +++ b/apps/i2ptunnel/jsp/editClient.jsp @@ -1,6 +1,7 @@ <%@page contentType="text/html" import="net.i2p.i2ptunnel.web.EditBean"%> + <% String tun = request.getParameter("tunnel"); int curTunnel = -1; if (tun != null) { @@ -13,7 +14,7 @@ %> - I2P Tunnel Manager - Edit + <%=intl._("I2P Tunnel Manager - Edit Client Tunnel")%> diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp index 610b68a51..da98470f7 100644 --- a/apps/i2ptunnel/jsp/editServer.jsp +++ b/apps/i2ptunnel/jsp/editServer.jsp @@ -1,6 +1,7 @@ <%@page contentType="text/html" import="net.i2p.i2ptunnel.web.EditBean"%> + <% String tun = request.getParameter("tunnel"); int curTunnel = -1; if (tun != null) { @@ -13,7 +14,7 @@ %> - I2P Tunnel Manager - Edit + <%=intl._("I2P Tunnel Manager - Edit Server Tunnel")%> diff --git a/apps/i2ptunnel/jsp/index.jsp b/apps/i2ptunnel/jsp/index.jsp index 87a006f6d..6c2f7f73e 100644 --- a/apps/i2ptunnel/jsp/index.jsp +++ b/apps/i2ptunnel/jsp/index.jsp @@ -8,9 +8,10 @@ + - I2P Tunnel Manager - List + <%=intl._("I2P Tunnel Manager - List")%> diff --git a/apps/i2ptunnel/locale/messages_de.po b/apps/i2ptunnel/locale/messages_de.po new file mode 100644 index 000000000..3862132a9 --- /dev/null +++ b/apps/i2ptunnel/locale/messages_de.po @@ -0,0 +1,30 @@ +# 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 , 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 \n" +"Language-Team: foo \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: German\n" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:73 +msgid "I2P Tunnel Manager - Edit Client Tunnel" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:73 +msgid "I2P Tunnel Manager - Edit Server Tunnel" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:71 +msgid "I2P Tunnel Manager - List" +msgstr "" diff --git a/build.xml b/build.xml index 961fe3dea..13de3a1b4 100644 --- a/build.xml +++ b/build.xml @@ -142,6 +142,7 @@ + From 14362630d70f516cc8bc83cb1521cae9a26b801f Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 10 Dec 2009 01:54:49 +0000 Subject: [PATCH 058/127] translation support --- apps/susidns/locale/messages_de.po | 22 +++++++ apps/susidns/src/bmsg.sh | 17 ++++++ apps/susidns/src/build.xml | 35 ++++++++++- apps/susidns/src/bundle-messages.bat | 26 +++++++++ apps/susidns/src/bundle-messages.sh | 87 ++++++++++++++++++++++++++++ apps/susidns/src/jsp/index.jsp | 3 +- build.xml | 1 + 7 files changed, 189 insertions(+), 2 deletions(-) create mode 100644 apps/susidns/locale/messages_de.po create mode 100644 apps/susidns/src/bmsg.sh create mode 100644 apps/susidns/src/bundle-messages.bat create mode 100755 apps/susidns/src/bundle-messages.sh diff --git a/apps/susidns/locale/messages_de.po b/apps/susidns/locale/messages_de.po new file mode 100644 index 000000000..6685ad87f --- /dev/null +++ b/apps/susidns/locale/messages_de.po @@ -0,0 +1,22 @@ +# I2P +# Copyright (C) 2009 The I2P Project +# This file is distributed under the same license as the susidns package. +# To contribute translations, see http://www.i2p2.de/newdevelopers +# foo , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: I2P susidns\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-10 01:53+0000\n" +"PO-Revision-Date: 2009-10-19 12:50+0000\n" +"Last-Translator: foo \n" +"Language-Team: foo \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: German\n" + +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:88 +msgid "Introduction - SusiDNS" +msgstr "" diff --git a/apps/susidns/src/bmsg.sh b/apps/susidns/src/bmsg.sh new file mode 100644 index 000000000..b9d294b32 --- /dev/null +++ b/apps/susidns/src/bmsg.sh @@ -0,0 +1,17 @@ +# +# Update messages_xx.po and messages_xx.class files, +# from both java and jsp sources. +# Requires installed programs xgettext, msgfmt, msgmerge, and find. +# zzz - public domain +# + +## launching sh.exe with -login parameter will open a shell with the current path always pointing to \bin\ +## need to cd into our orignal path - where we call sh.exe from. + +cd $CALLFROM +## echo $PWD + +## except this everything is the same with bundle-message.sh +## walking - public domain :-D + +source bundle-messages.sh $PARAS \ No newline at end of file diff --git a/apps/susidns/src/build.xml b/apps/susidns/src/build.xml index a622f96c4..b0f7e96cf 100644 --- a/apps/susidns/src/build.xml +++ b/apps/susidns/src/build.xml @@ -61,7 +61,7 @@ - + @@ -75,6 +75,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/susidns/src/bundle-messages.bat b/apps/susidns/src/bundle-messages.bat new file mode 100644 index 000000000..90feca972 --- /dev/null +++ b/apps/susidns/src/bundle-messages.bat @@ -0,0 +1,26 @@ +@echo off +set Callfrom=%cd% +set Paras=%1 + +rem before calling make sure you have msys and mingw 's "bin" path +rem in your current searching path +rem type "set path" to check +if not exist ..\locale\*.only goto updateALL + +rem put a messages_xx.only(eg messages_zh.only) into locale folder +rem this script will only touch the po file(eg zh) you specified, leaving other po files untact. + +for %%i in (..\locale\*.only) do set PO=%%~ni +echo [Notice] Yu choose to Ony update the choosen file: %PO%.po +for %%i in (..\locale\*.po) do if not %%~ni==%PO% ren %%i %%~ni.po- + +call sh --login %cd%\bmsg.sh + +for %%i in (..\locale\*.po-) do if not %%~ni==%PO% ren %%i %%~ni.po +goto end + +:updateALL +call sh --login %cd%\bmsg.sh + +:end +echo End of Message Bundling \ No newline at end of file diff --git a/apps/susidns/src/bundle-messages.sh b/apps/susidns/src/bundle-messages.sh new file mode 100755 index 000000000..e21706e88 --- /dev/null +++ b/apps/susidns/src/bundle-messages.sh @@ -0,0 +1,87 @@ +# +# Update messages_xx.po and messages_xx.class files, +# from both java and jsp sources. +# Requires installed programs xgettext, msgfmt, msgmerge, and find. +# +# usage: +# bundle-messages.sh (generates the resource bundle from the .po file) +# bundle-messages.sh -p (updates the .po file from the source tags, then generates the resource bundle) +# +# zzz - public domain +# +CLASS=i2p.susi.dns.messages +TMPFILE=tmp/javafiles.txt +export TZ=UTC + +if [ "$1" = "-p" ] +then + POUPDATE=1 +fi + +# add ../src/ so the refs will work in the po file +JPATHS="../src/java/ ../src/tmp/" +for i in ../locale/messages_*.po +do + # get language + LG=${i#../locale/messages_} + LG=${LG%.po} + + if [ "$POUPDATE" = "1" ] + then + # make list of java files newer than the .po file + find $JPATHS -name *.java -newer $i > $TMPFILE + fi + + if [ -s WEB-INF/classes/i2p/susi/dns/messages_$LG.class -a \ + WEB-INF/classes/i2p/susi/dns/messages_$LG.class -nt $i -a \ + ! -s $TMPFILE ] + then + continue + fi + + if [ "$POUPDATE" = "1" ] + then + echo "Updating the $i file from the tags..." + # extract strings from java and jsp files, and update messages.po files + # translate calls must be one of the forms: + # _("foo") + # _x("foo") + # intl._("foo") + # In a jsp, you must use a helper or handler that has the context set. + # To start a new translation, copy the header from an old translation to the new .po file, + # then ant distclean updater. + find $JPATHS -name *.java > $TMPFILE + xgettext -f $TMPFILE -F -L java --from-code=UTF-8 \ + --keyword=_ --keyword=_x --keyword=intl._ --keyword=intl.title \ + -o ${i}t + if [ $? -ne 0 ] + then + echo 'Warning - xgettext failed, not updating translations' + rm -f ${i}t + break + fi + msgmerge -U --backup=none $i ${i}t + if [ $? -ne 0 ] + then + echo 'Warning - msgmerge failed, not updating translations' + rm -f ${i}t + break + fi + rm -f ${i}t + # so we don't do this again + touch $i + fi + + echo "Generating ${CLASS}_$LG ResourceBundle..." + + # convert to class files in build/obj + msgfmt --java -r $CLASS -l $LG -d WEB-INF/classes $i + if [ $? -ne 0 ] + then + echo 'Warning - msgfmt failed, not updating translations' + break + fi +done +rm -f $TMPFILE +# todo: return failure +exit 0 diff --git a/apps/susidns/src/jsp/index.jsp b/apps/susidns/src/jsp/index.jsp index debd97c13..795dd7373 100644 --- a/apps/susidns/src/jsp/index.jsp +++ b/apps/susidns/src/jsp/index.jsp @@ -26,10 +26,11 @@ <%@ page contentType="text/html"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> + -introduction - susidns v${version.version} +<%=intl._("Introduction - SusiDNS")%> v${version.version} diff --git a/build.xml b/build.xml index 13de3a1b4..363d3786f 100644 --- a/build.xml +++ b/build.xml @@ -143,6 +143,7 @@ + From 8116d88aafd6a751f55afed3e639e996b5577d7c Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 10 Dec 2009 02:12:18 +0000 Subject: [PATCH 059/127] translation build fixups --- apps/i2psnark/java/build.xml | 8 +++----- apps/i2psnark/java/bundle-messages.sh | 6 +++--- apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java | 2 +- apps/i2ptunnel/java/bundle-messages.sh | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/apps/i2psnark/java/build.xml b/apps/i2psnark/java/build.xml index bcafb362e..8323d57f6 100644 --- a/apps/i2psnark/java/build.xml +++ b/apps/i2psnark/java/build.xml @@ -36,8 +36,8 @@ - - + + @@ -51,7 +51,7 @@ - So we must continue to duplicate everything in the war. --> - + @@ -127,9 +127,7 @@ - - diff --git a/apps/i2psnark/java/bundle-messages.sh b/apps/i2psnark/java/bundle-messages.sh index bd62ea9ee..ad8c0ab84 100755 --- a/apps/i2psnark/java/bundle-messages.sh +++ b/apps/i2psnark/java/bundle-messages.sh @@ -9,7 +9,7 @@ # # zzz - public domain # -CLASS=org.klomp.snark.messages +CLASS=org.klomp.snark.web.messages TMPFILE=build/javafiles.txt export TZ=UTC @@ -32,8 +32,8 @@ do find $JPATHS -name *.java -newer $i > $TMPFILE fi - if [ -s build/obj/org/klomp/snark/messages_$LG.class -a \ - build/obj/org/klomp/snark/messages_$LG.class -nt $i -a \ + if [ -s build/obj/org/klomp/snark/web/messages_$LG.class -a \ + build/obj/org/klomp/snark/web/messages_$LG.class -nt $i -a \ ! -s $TMPFILE ] then continue diff --git a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java index b40233fbb..3eafb645e 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java +++ b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java @@ -404,7 +404,7 @@ public class I2PSnarkUtil { } } - private static final String BUNDLE_NAME = "org.klomp.snark.messages"; + private static final String BUNDLE_NAME = "org.klomp.snark.web.messages"; /** lang in routerconsole.lang property, else current locale */ public String getString(String key) { diff --git a/apps/i2ptunnel/java/bundle-messages.sh b/apps/i2ptunnel/java/bundle-messages.sh index b4f694b71..aa98a3167 100755 --- a/apps/i2ptunnel/java/bundle-messages.sh +++ b/apps/i2ptunnel/java/bundle-messages.sh @@ -32,8 +32,8 @@ do find $JPATHS -name *.java -newer $i > $TMPFILE fi - if [ -s build/obj/net/i2p/i2ptunnel/messages_$LG.class -a \ - build/obj/net/i2p/i2ptunnel/messages_$LG.class -nt $i -a \ + if [ -s build/obj/net/i2p/i2ptunnel/web/messages_$LG.class -a \ + build/obj/net/i2p/i2ptunnel/web/messages_$LG.class -nt $i -a \ ! -s $TMPFILE ] then continue From c39f047703558a185d431066ce4f3e9afead0ec8 Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 10 Dec 2009 14:52:09 +0000 Subject: [PATCH 060/127] pretty much the last of the tags --- .../org/klomp/snark/web/I2PSnarkServlet.java | 127 ++++++-- apps/i2psnark/locale/messages_de.po | 296 +++++++++++++----- 2 files changed, 308 insertions(+), 115 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index f1d716273..0cf576a18 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -95,7 +95,9 @@ public class I2PSnarkServlet extends HttpServlet { out.write(_("Refresh page")); out.write("\" class=\"snarkRefresh\">"); out.write(_("I2PSnark")); - out.write(" Forum\n"); + out.write(" "); + out.write(_("Forum")); + out.write("\n"); Map trackers = _manager.getTrackers(); for (Iterator iter = trackers.entrySet().iterator(); iter.hasNext(); ) { @@ -664,7 +666,7 @@ public class I2PSnarkServlet extends HttpServlet { else if ("VUZP".equals(ch)) client = "Robert"; else - client = "Unknown (" + ch + ')'; + client = _("Unknown") + " (" + ch + ')'; out.write(client + "  " + peer.toString().substring(5, 9)); if (showDebug) out.write(" inactive " + (peer.getInactiveTime() / 1000) + "s"); @@ -735,13 +737,21 @@ public class I2PSnarkServlet extends HttpServlet { // *not* enctype="multipart/form-data", so that the input type=file sends the filename, not the file out.write("
      \n"); out.write("\n"); - out.write("
      Add Torrent
      \n"); - out.write("From URL : \n"); + out.write("
      "); + out.write(_("Add Torrent")); + out.write("
      \n"); + out.write(_("From URL")); + out.write(": \n"); // not supporting from file at the moment, since the file name passed isn't always absolute (so it may not resolve) //out.write("From file:
      \n"); - out.write("
      \n"); - out.write("Alternately, you can copy .torrent files to " + _manager.getDataDir().getAbsolutePath() + "
      \n"); - out.write("Removing that .torrent file will cause the torrent to stop.
      \n"); + out.write("
      \n"); + out.write(""); + out.write(_("Alternately, you can copy .torrent files to {0} .", _manager.getDataDir().getAbsolutePath())); + out.write("
      \n"); + out.write(_("Removing that .torrent file will cause the torrent to stop.")); + out.write("
      \n"); out.write("\n
      "); } @@ -755,12 +765,20 @@ public class I2PSnarkServlet extends HttpServlet { // *not* enctype="multipart/form-data", so that the input type=file sends the filename, not the file out.write("
      \n"); out.write("\n"); - out.write("Create Torrent
      \n"); + out.write(""); + out.write(_("Create Torrent")); + out.write("
      \n"); //out.write("From file:
      \n"); - out.write("Data to seed: " + _manager.getDataDir().getAbsolutePath() + File.separatorChar + out.write(_("Data to seed")); + out.write(": " + _manager.getDataDir().getAbsolutePath() + File.separatorChar + "
      \n"); - out.write("Tracker: \n"); Map trackers = _manager.getTrackers(); for (Iterator iter = trackers.entrySet().iterator(); iter.hasNext(); ) { Map.Entry entry = (Map.Entry)iter.next(); @@ -772,9 +790,14 @@ public class I2PSnarkServlet extends HttpServlet { out.write("\t\n"); } out.write("\n"); - out.write("or "); - out.write("\n"); + out.write(_("or")); + out.write(" "); + out.write("\n"); out.write("\n
      "); } @@ -789,12 +812,26 @@ public class I2PSnarkServlet extends HttpServlet { out.write("
      \n"); out.write("
      \n"); out.write("\n"); - out.write("Configuration
      \n"); - out.write("
      InboundOutbound
      " + _("Depth") + ":
      " + _("Length") + ":"); + out.write(_("Torrent")); + out.write(""); + out.write(_("ETA")); + out.write(""); + out.write(_("Downloaded")); + out.write(""); + out.write(_("Uploaded")); + out.write(""); + out.write(_("Down Rate")); + out.write(""); + out.write(_("Up Rate")); + out.write(""); - if (_manager.util().connected()) + if (_manager.util().connected()) { out.write("Stop All"); - else if (snarks.size() > 0) + "\" title=\""); + out.write(_("Stop all torrents and the I2P tunnel")); + out.write("\">"); + out.write(_("Stop All")); + out.write(""); + } else if (snarks.size() > 0) { out.write("Start All"); - else + "\" title=\""); + out.write(_("Start all torrents and the I2P tunnel")); + out.write("\">"); + out.write(_("Start All")); + out.write(""); + } else { out.write(" "); + } out.write("
      "); + out.write(_("No torrents loaded.")); + out.write("
      Totals (" + @@ -464,30 +507,30 @@ public class I2PSnarkServlet extends HttpServlet { } } else if (remaining <= 0) { if (isRunning && curPeers > 0 && !showPeers) - statusString = "Seeding (" + - curPeers + "/" + knownPeers + - " peers)"; + statusString = _("Seeding") + " (" + + curPeers + '/' + knownPeers + + " " + _("peers") + ")"; else if (isRunning) - statusString = "Seeding (" + curPeers + "/" + knownPeers + " peers)"; + statusString = _("Seeding") + " (" + curPeers + "/" + knownPeers + ' ' + ("peers") + ')'; else - statusString = "Complete"; + statusString = _("Complete"); } else { if (isRunning && curPeers > 0 && downBps > 0 && !showPeers) - statusString = "OK (" + + statusString = _("OK") + " (" + curPeers + "/" + knownPeers + - " peers)"; + " " + _("peers") + ")"; else if (isRunning && curPeers > 0 && downBps > 0) - statusString = "OK (" + curPeers + "/" + knownPeers + " peers)"; + statusString = _("OK") + " (" + curPeers + "/" + knownPeers + ' ' + _("peers") + ')'; else if (isRunning && curPeers > 0 && !showPeers) - statusString = "Stalled (" + - curPeers + "/" + knownPeers + - " peers)"; + statusString = _("Stalled") + " (" + + curPeers + '/' + knownPeers + + " " + _("peers") + ")"; else if (isRunning && curPeers > 0) - statusString = "Stalled (" + curPeers + "/" + knownPeers + " peers)"; + statusString = _("Stalled") + " (" + curPeers + '/' + knownPeers + ' ' + _("peers") + ')'; else if (isRunning) - statusString = "No Peers (0/" + knownPeers + ")"; + statusString = _("No Peers") + " (0/" + knownPeers + ')'; else - statusString = "Stopped"; + statusString = _("Stopped"); } String rowClass = (row % 2 == 0 ? "snarkTorrentEven" : "snarkTorrentOdd"); @@ -500,9 +543,10 @@ public class I2PSnarkServlet extends HttpServlet { out.write(""); + out.write(_("View files")); else - out.write("Open file\">"); + out.write(_("Open file")); + out.write("\">"); } out.write(filename); if (remaining == 0) @@ -525,7 +569,9 @@ public class I2PSnarkServlet extends HttpServlet { baseURL = baseURL.substring(e + 1); out.write("   [Details]"); + out.write("\" title=\"" + name + " Tracker\">"); + out.write(_("Details")); + out.write("]"); break; } } @@ -557,17 +603,35 @@ public class I2PSnarkServlet extends HttpServlet { parameters = parameters + "&p=1"; if (isRunning) { out.write("Stop"); + + "\" title=\""); + out.write(_("Stop the torrent")); + out.write("\">"); + out.write(_("Stop")); + out.write(""); } else { - if (isValid) + if (isValid) { out.write("Start "); + + "\" title=\""); + out.write(_("Start the torrent")); + out.write("\">"); + out.write(_("Start")); + out.write("\n"); + } out.write("Remove
      "); + + "\" title=\""); + out.write(_("Remove the torrent from the active list, deleting the .torrent file")); + out.write("\">"); + out.write(_("Remove")); + out.write("
      "); out.write("Delete "); + + "\" title=\""); + out.write(_("Delete the .torrent file and the associated data file(s)")); + out.write("\">"); + out.write(_("Delete")); + out.write(""); } out.write("\n
      "); out.write(""); + out.write(""); String ch = peer.toString().substring(0, 4); String client; if ("AwMD".equals(ch)) - client = "I2PSnark"; + client = _("I2PSnark"); else if ("BFJT".equals(ch)) client = "I2PRufus"; else if ("TTMt".equals(ch)) @@ -606,7 +670,7 @@ public class I2PSnarkServlet extends HttpServlet { out.write(""); float pct = (float) (100.0 * (float) peer.completed() / snark.meta.getPieces()); if (pct == 100.0) - out.write("Seed"); + out.write(_("Seed")); else { String ps = String.valueOf(pct); if (ps.length() > 5) @@ -624,9 +688,10 @@ public class I2PSnarkServlet extends HttpServlet { } else { out.write(""); + out.write(_("Uninteresting")); else - out.write("Choked\">"); + out.write(_("Choked")); + out.write("\">"); out.write(formatSize(peer.getDownloadRate()) + "ps"); } } @@ -639,9 +704,10 @@ public class I2PSnarkServlet extends HttpServlet { } else { out.write(""); + out.write(_("Uninterested")); else - out.write("Choking\">"); + out.write(_("Choking")); + out.write("\">"); out.write(formatSize(peer.getUploadRate()) + "ps"); } } @@ -779,6 +845,14 @@ public class I2PSnarkServlet extends HttpServlet { out.write(""); } + private String _(String s) { + return _manager.util().getString(s); + } + + private String _(String s, Object o) { + return _manager.util().getString(s, o); + } + // rounding makes us look faster :) private String formatSize(long bytes) { if (bytes < 5*1024) @@ -791,28 +865,12 @@ public class I2PSnarkServlet extends HttpServlet { return ((bytes + 512*1024*1024)/(1024*1024*1024)) + "GB"; } - private static final String HEADER_BEGIN = "\n" + - "\n" + - "I2PSnark - Anonymous BitTorrent Client\n"; - private static final String HEADER = ""; private static final String TABLE_HEADER = "\n" + "\n" + - "\n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n"; - - private static final String TABLE_EMPTY = "" + - "\n"; + "
      Status \n"; - - private static final String TABLE_HEADER2 = "TorrentETADownloadedUploadedDown RateUp Rate
      No torrents loaded.
      "; private static final String TABLE_FOOTER = "
      \n"; diff --git a/apps/i2psnark/locale/messages_de.po b/apps/i2psnark/locale/messages_de.po new file mode 100644 index 000000000..fd52fbb81 --- /dev/null +++ b/apps/i2psnark/locale/messages_de.po @@ -0,0 +1,186 @@ +# 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 , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: I2P i2psnark\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-09 20:35+0000\n" +"PO-Revision-Date: 2009-10-19 12:50+0000\n" +"Last-Translator: foo \n" +"Language-Team: foo \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: German\n" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:86 +msgid "I2PSnark - Anonymous BitTorrent Client" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:95 +msgid "Refresh page" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:97 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:649 +msgid "I2PSnark" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:123 +msgid "Status" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:130 +msgid "Hide Peers" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:132 +msgid "Show Peers" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:136 +msgid "Torrent" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:138 +msgid "ETA" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:140 +msgid "Downloaded" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:142 +msgid "Uploaded" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:144 +msgid "Down Rate" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:146 +msgid "Up Rate" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:153 +msgid "Stop all torrents and the I2P tunnel" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:155 +msgid "Stop All" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:160 +msgid "Start all torrents and the I2P tunnel" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:162 +msgid "Start All" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:179 +msgid "No torrents loaded." +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:514 +msgid "Seeding" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:521 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:523 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:527 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:529 +msgid "peers" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:516 +msgid "Complete" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:519 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:523 +msgid "OK" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:525 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:529 +msgid "Stalled" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:531 +msgid "No Peers" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:533 +msgid "Stopped" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:546 +msgid "View files" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:548 +msgid "Open file" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:573 +msgid "Details" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:607 +msgid "Stop the torrent" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:609 +msgid "Stop" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 +msgid "Start the torrent" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617 +msgid "Start" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:622 +msgid "Remove the torrent from the active list, deleting the .torrent file" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:624 +msgid "Remove" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628 +msgid "Delete the .torrent file and the associated data file(s)" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630 +msgid "Delete" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673 +msgid "Seed" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:691 +msgid "Uninteresting" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:693 +msgid "Choked" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:707 +msgid "Uninterested" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:709 +msgid "Choking" +msgstr "" diff --git a/build.xml b/build.xml index 1b54d2fb2..961fe3dea 100644 --- a/build.xml +++ b/build.xml @@ -141,6 +141,7 @@ + From 02baf905c67a6e3acb779abfb3709a2b53c9b907 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 9 Dec 2009 21:22:06 +0000 Subject: [PATCH 055/127] more tagging --- .../org/klomp/snark/web/I2PSnarkServlet.java | 75 ++++++++++--------- 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index 3198ca4b7..cd97ad272 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -217,7 +217,7 @@ public class I2PSnarkServlet extends HttpServlet { if ( (newFile != null) && (newFile.trim().length() > 0) ) f = new File(newFile.trim()); if ( (f != null) && (!f.exists()) ) { - _manager.addMessage("Torrent file " + newFile +" does not exist"); + _manager.addMessage(_("Torrent file {0} does not exist", newFile)); } if ( (f != null) && (f.exists()) ) { File local = new File(_manager.getDataDir(), f.getName()); @@ -227,16 +227,16 @@ public class I2PSnarkServlet extends HttpServlet { if (local.exists()) { if (_manager.getTorrent(canonical) != null) - _manager.addMessage("Torrent already running: " + newFile); + _manager.addMessage(_("Torrent already running: {0}", newFile)); else - _manager.addMessage("Torrent already in the queue: " + newFile); + _manager.addMessage(_("Torrent already in the queue: {0}", newFile)); } else { boolean ok = FileUtil.copy(f.getAbsolutePath(), local.getAbsolutePath(), true); if (ok) { - _manager.addMessage("Copying torrent to " + local.getAbsolutePath()); + _manager.addMessage(_("Copying torrent to {0}", local.getAbsolutePath())); _manager.addTorrent(canonical); } else { - _manager.addMessage("Unable to copy the torrent to " + local.getAbsolutePath() + " from " + f.getAbsolutePath()); + _manager.addMessage(_("Unable to copy the torrent to {0}", local.getAbsolutePath()) + ' ' + _("from {0}", f.getAbsolutePath())); } } } catch (IOException ioe) { @@ -244,11 +244,11 @@ public class I2PSnarkServlet extends HttpServlet { } } else if (newURL != null) { if (newURL.startsWith("http://")) { - _manager.addMessage("Fetching " + newURL); + _manager.addMessage(_("Fetching {0}", newURL)); I2PAppThread fetch = new I2PAppThread(new FetchAndAdd(_manager, newURL), "Fetch and add"); fetch.start(); } else { - _manager.addMessage("Invalid URL - must start with http://"); + _manager.addMessage(_("Invalid URL - must start with http://")); } } else { // no file or URL specified @@ -278,7 +278,7 @@ public class I2PSnarkServlet extends HttpServlet { Snark snark = _manager.getTorrent(name); if ( (snark != null) && (DataHelper.eq(infoHash, snark.meta.getInfoHash())) ) { snark.startTorrent(); - _manager.addMessage("Starting up torrent " + name); + _manager.addMessage(_("Starting up torrent {0}", name)); break; } } @@ -298,7 +298,7 @@ public class I2PSnarkServlet extends HttpServlet { // yeah, need to, otherwise it'll get autoadded again (at the moment File f = new File(name); f.delete(); - _manager.addMessage("Torrent file deleted: " + f.getAbsolutePath()); + _manager.addMessage(_("Torrent file deleted: {0}", f.getAbsolutePath())); break; } } @@ -316,15 +316,15 @@ public class I2PSnarkServlet extends HttpServlet { _manager.stopTorrent(name, true); File f = new File(name); f.delete(); - _manager.addMessage("Torrent file deleted: " + f.getAbsolutePath()); + _manager.addMessage(_("Torrent file deleted: {0}", f.getAbsolutePath())); List files = snark.meta.getFiles(); String dataFile = snark.meta.getName(); f = new File(_manager.getDataDir(), dataFile); if (files == null) { // single file torrent if (f.delete()) - _manager.addMessage("Data file deleted: " + f.getAbsolutePath()); + _manager.addMessage(_("Data file deleted: {0}", f.getAbsolutePath())); else - _manager.addMessage("Data file could not be deleted: " + f.getAbsolutePath()); + _manager.addMessage(_("Data file could not be deleted: {0}", f.getAbsolutePath())); break; } for (int i = 0; i < files.size(); i++) { // pass 1 delete files @@ -332,9 +332,9 @@ public class I2PSnarkServlet extends HttpServlet { // each of those lists just contain a single file afaict... File df = Storage.getFileFromNames(f, (List) files.get(i)); if (df.delete()) - _manager.addMessage("Data file deleted: " + df.getAbsolutePath()); + _manager.addMessage(_("Data file deleted: {0}", df.getAbsolutePath())); else - _manager.addMessage("Data file could not be deleted: " + df.getAbsolutePath()); + _manager.addMessage(_("Data file could not be deleted: {0}", df.getAbsolutePath())); } for (int i = files.size() - 1; i >= 0; i--) { // pass 2 delete dirs - not foolproof, // we could sort and do a strict bottom-up @@ -343,7 +343,7 @@ public class I2PSnarkServlet extends HttpServlet { if (df == null || !df.exists()) continue; if(df.delete()) - _manager.addMessage("Data dir deleted: " + df.getAbsolutePath()); + _manager.addMessage(_("Data dir deleted: {0}", df.getAbsolutePath())); } break; } @@ -374,7 +374,7 @@ public class I2PSnarkServlet extends HttpServlet { announceURL = announceURLOther; if (announceURL == null || announceURL.length() <= 0) - _manager.addMessage("Error creating torrent - you must select a tracker"); + _manager.addMessage(_("Error creating torrent - you must select a tracker")); else if (baseFile.exists()) { try { Storage s = new Storage(_manager.util(), baseFile, announceURL, null); @@ -389,21 +389,21 @@ public class I2PSnarkServlet extends HttpServlet { FileOutputStream out = new FileOutputStream(torrentFile); out.write(info.getTorrentData()); out.close(); - _manager.addMessage("Torrent created for " + baseFile.getName() + ": " + torrentFile.getAbsolutePath()); + _manager.addMessage(_("Torrent created for {0}", baseFile.getName()) + ": " + torrentFile.getAbsolutePath()); // now fire it up, but don't automatically seed it _manager.addTorrent(torrentFile.getCanonicalPath(), true); - _manager.addMessage("Many I2P trackers require you to register new torrents before seeding - please do so before starting " + baseFile.getName()); + _manager.addMessage(_("Many I2P trackers require you to register new torrents before seeding - please do so before starting {0}", baseFile.getName())); } catch (IOException ioe) { - _manager.addMessage("Error creating a torrent for " + baseFile.getAbsolutePath() + ": " + ioe.getMessage()); + _manager.addMessage(_("Error creating a torrent for {0}", baseFile.getAbsolutePath()) + ": " + ioe.getMessage()); } } else { - _manager.addMessage("Cannot create a torrent for the nonexistent data: " + baseFile.getAbsolutePath()); + _manager.addMessage(_("Cannot create a torrent for the nonexistent data: {0}", baseFile.getAbsolutePath())); } } else { - _manager.addMessage("Error creating torrent - you must enter a file or directory"); + _manager.addMessage(_("Error creating torrent - you must enter a file or directory")); } } else if ("StopAll".equals(action)) { - _manager.addMessage("Stopping all torrents and closing the I2P tunnel."); + _manager.addMessage(_("Stopping all torrents and closing the I2P tunnel.")); List snarks = getSortedSnarks(req); for (int i = 0; i < snarks.size(); i++) { Snark snark = (Snark)snarks.get(i); @@ -412,10 +412,10 @@ public class I2PSnarkServlet extends HttpServlet { } if (_manager.util().connected()) { _manager.util().disconnect(); - _manager.addMessage("I2P tunnel closed."); + _manager.addMessage(_("I2P tunnel closed.")); } } else if ("StartAll".equals(action)) { - _manager.addMessage("Opening the I2P tunnel and starting all torrents."); + _manager.addMessage(_("Opening the I2P tunnel and starting all torrents.")); List snarks = getSortedSnarks(req); for (int i = 0; i < snarks.size(); i++) { Snark snark = (Snark)snarks.get(i); @@ -492,18 +492,18 @@ public class I2PSnarkServlet extends HttpServlet { knownPeers = snark.coordinator.trackerSeenPeers; } - String statusString = "Unknown"; + String statusString = _("Unknown"); if (err != null) { if (isRunning && curPeers > 0 && !showPeers) - statusString = "TrackerErr (" + + statusString = "" + _("TrackerErr") + " (" + curPeers + "/" + knownPeers + - " peers)"; + " " + _("peers") + ")"; else if (isRunning) - statusString = "TrackerErr (" + curPeers + "/" + knownPeers + " peers)"; + statusString = "" + _("TrackerErr") + " (" + curPeers + '/' + knownPeers + ' ' + _("peers") + ')'; else { if (err.length() > MAX_DISPLAYED_ERROR_LENGTH) err = err.substring(0, MAX_DISPLAYED_ERROR_LENGTH) + "…"; - statusString = "TrackerErr
      (" + err + ")"; + statusString = _("TrackerErr") + "
      (" + err + ")"; } } else if (remaining <= 0) { if (isRunning && curPeers > 0 && !showPeers) @@ -569,7 +569,7 @@ public class I2PSnarkServlet extends HttpServlet { baseURL = baseURL.substring(e + 1); out.write("   [      "); + out.write("\" title=\"" + name + ' ' + _("Tracker") + "\">"); out.write(_("Details")); out.write("]"); break; @@ -890,7 +890,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 " + _url); + _manager.addMessage(_("Torrent fetched from {0}", _url)); FileInputStream in = null; try { in = new FileInputStream(file); @@ -909,25 +909,30 @@ private static class FetchAndAdd implements Runnable { if (torrentFile.exists()) { if (_manager.getTorrent(canonical) != null) - _manager.addMessage("Torrent already running: " + name); + _manager.addMessage(_("Torrent already running: {0}", name)); else - _manager.addMessage("Torrent already in the queue: " + name); + _manager.addMessage(_("Torrent already in the queue: {0}", name)); } else { FileUtil.copy(file.getAbsolutePath(), canonical, true); _manager.addTorrent(canonical); } } catch (IOException ioe) { - _manager.addMessage("Torrent at " + _url + " was not valid: " + ioe.getMessage()); + _manager.addMessage(_("Torrent at {0} was not valid", _url) + ": " + ioe.getMessage()); } finally { try { in.close(); } catch (IOException ioe) {} } } else { - _manager.addMessage("Torrent was not retrieved from " + _url); + _manager.addMessage(_("Torrent was not retrieved from {0}", _url)); } } finally { if (file != null) file.delete(); } } + + private String _(String s, String o) { + return _manager.util().getString(s, o); + } + } } From eeb884e8ce55d2a3545f64be0dad3266ec37ca8b Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 9 Dec 2009 23:36:18 +0000 Subject: [PATCH 056/127] more tags --- .../org/klomp/snark/web/I2PSnarkServlet.java | 12 +- apps/i2psnark/locale/messages_de.po | 216 +++++++++++++++--- 2 files changed, 194 insertions(+), 34 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index cd97ad272..9c0cd78dc 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -180,10 +180,14 @@ public class I2PSnarkServlet extends HttpServlet { out.write("
      Totals (" + - snarks.size() + " torrents, " + - DataHelper.formatSize(stats[5]) + "B, " + - stats[4] + " connected peers)"); + out.write(_("Totals")); + out.write(" {"); + out.write(_("{0} torrents", snarks.size())); + out.write(", "); + out.write(DataHelper.formatSize(stats[5]) + "B, "); + out.write(_("{0} connected peers", stats[4])); + out.write(") " + formatSize(stats[0]) + "" + formatSize(stats[1]) + "
      \n\n
      Data directory:
      (Edit i2psnark.config and restart to change)
      \n"); - out.write("
      Auto start: "); + out.write(_("Configuration")); + out.write("
      \n"); + out.write("
      "); + out.write(_("Data directory")); + out.write(":
      ("); + out.write(_("Edit i2psnark.config and restart to change")); + out.write(")
      \n"); + + out.write("
      "); + out.write(_("Auto start")); + out.write(": "); + + "title=\""); + out.write(_("If checked, automatically start torrents that are added")); + out.write("\" >"); + //Auto add: //Auto stop: //out.write("
      \n"); @@ -814,15 +851,33 @@ public class I2PSnarkServlet extends HttpServlet { out.write("\n\t"); out.write("
      \n"); */ - out.write("
      Total uploader limit: peers
      \n"); - out.write("
      Up bandwidth limit: KBps (Half available bandwidth recommended.)
      \n"); + out.write("
      "); + out.write(_("Total uploader limit")); + out.write(": "); + out.write(_("peers")); + out.write("
      \n"); + + out.write("
      "); + out.write(_("Up bandwidth limit")); + out.write(": KBps ("); + out.write(_("Half available bandwidth< recommended.")); + out.write(" "); + out.write(_("Configure")); + out.write(")
      \n"); - out.write("
      Use open trackers also: "); + out.write(_("Use open trackers also")); + out.write(": "); - out.write("
      Open tracker announce URLs: "); + + out.write("
      "); + out.write(_("Open tracker announce URLs")); + out.write(":
      \n"); //out.write("\n"); @@ -830,10 +885,17 @@ public class I2PSnarkServlet extends HttpServlet { // + _manager.util().getEepProxyHost() + "\" size=\"15\" /> "); //out.write("port:
      \n"); - out.write("
      I2CP host: "); + out.write(_("I2CP host")); + out.write(": "); - out.write("
      I2CP port: "); + out.write(_("I2CP port")); + out.write(":
      \n"); + StringBuilder opts = new StringBuilder(64); Map options = new TreeMap(_manager.util().getI2CPOptions()); for (Iterator iter = options.entrySet().iterator(); iter.hasNext(); ) { @@ -842,9 +904,14 @@ public class I2PSnarkServlet extends HttpServlet { String val = (String)entry.getValue(); opts.append(key).append('=').append(val).append(' '); } - out.write("
      I2CP options:
      \n"); - out.write("
       \n"); + + out.write("
       \n"); out.write("
      \n"); out.write(""); } diff --git a/apps/i2psnark/locale/messages_de.po b/apps/i2psnark/locale/messages_de.po index d2915b6e3..f501c93f1 100644 --- a/apps/i2psnark/locale/messages_de.po +++ b/apps/i2psnark/locale/messages_de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P i2psnark\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-09 23:27+0000\n" +"POT-Creation-Date: 2009-12-10 14:50+0000\n" "PO-Revision-Date: 2009-10-19 12:50+0000\n" "Last-Translator: foo \n" "Language-Team: foo \n" @@ -26,317 +26,443 @@ msgid "Refresh page" msgstr "" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:97 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:653 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:655 msgid "I2PSnark" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:123 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:99 +msgid "Forum" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:125 msgid "Status" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:130 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:132 msgid "Hide Peers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:132 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:134 msgid "Show Peers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:136 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:138 msgid "Torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:138 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:140 msgid "ETA" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:140 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:142 msgid "Downloaded" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:142 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:144 msgid "Uploaded" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:144 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:146 msgid "Down Rate" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:146 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:148 msgid "Up Rate" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:153 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:155 msgid "Stop all torrents and the I2P tunnel" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:155 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:157 msgid "Stop All" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:160 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:162 msgid "Start all torrents and the I2P tunnel" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:162 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:164 msgid "Start All" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:179 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:181 msgid "No torrents loaded." msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:184 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:186 msgid "Totals" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:186 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:188 #, java-format msgid "{0} torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:189 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:191 #, java-format msgid "{0} connected peers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:224 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:226 #, java-format msgid "Torrent file {0} does not exist" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:234 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:916 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:236 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:983 #, java-format msgid "Torrent already running: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:236 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:918 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:238 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985 #, java-format msgid "Torrent already in the queue: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:240 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:242 #, java-format msgid "Copying torrent to {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:243 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:245 #, java-format msgid "Unable to copy the torrent to {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:243 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:245 #, java-format msgid "from {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:251 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:253 #, java-format msgid "Fetching {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:255 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:257 msgid "Invalid URL - must start with http://" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:285 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:287 #, java-format msgid "Starting up torrent {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:305 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:323 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:307 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:325 #, java-format msgid "Torrent file deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:329 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:339 -#, java-format -msgid "Data file deleted: {0}" -msgstr "" - #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:331 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:341 #, java-format +msgid "Data file deleted: {0}" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:333 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:343 +#, java-format msgid "Data file could not be deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:350 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:352 #, java-format msgid "Data dir deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:381 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:383 msgid "Error creating torrent - you must select a tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:396 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:398 #, java-format msgid "Torrent created for {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:399 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:401 #, java-format msgid "" "Many I2P trackers require you to register new torrents before seeding - " "please do so before starting {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:401 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:403 #, java-format msgid "Error creating a torrent for {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:404 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:406 #, java-format msgid "Cannot create a torrent for the nonexistent data: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:407 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:409 msgid "Error creating torrent - you must enter a file or directory" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:410 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:412 msgid "Stopping all torrents and closing the I2P tunnel." msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:419 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:421 msgid "I2P tunnel closed." msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:422 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:424 msgid "Opening the I2P tunnel and starting all torrents." msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:499 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:501 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:669 msgid "Unknown" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:502 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:506 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:504 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512 msgid "TrackerErr" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:504 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:506 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:516 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:525 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:518 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:527 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:531 +#: ../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:535 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:858 msgid "peers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:514 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:518 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:516 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:520 msgid "Seeding" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:520 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:522 msgid "Complete" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:523 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:527 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:525 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:529 msgid "OK" 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:531 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535 msgid "Stalled" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 msgid "No Peers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:539 msgid "Stopped" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:550 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:552 msgid "View files" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:552 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:554 msgid "Open file" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:576 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:578 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:778 msgid "Tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:577 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:579 msgid "Details" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:611 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:613 msgid "Stop the torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:613 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 msgid "Stop" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:619 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:621 msgid "Start the torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:621 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:623 msgid "Start" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:626 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628 msgid "Remove the torrent from the active list, deleting the .torrent file" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630 msgid "Remove" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:632 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:634 msgid "Delete the .torrent file and the associated data file(s)" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:634 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:636 msgid "Delete" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:677 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:679 msgid "Seed" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:695 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:697 msgid "Uninteresting" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:697 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:699 msgid "Choked" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:711 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:713 msgid "Uninterested" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:713 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:715 msgid "Choking" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:897 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:741 +msgid "Add Torrent" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:743 +msgid "From URL" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:748 +msgid "Add torrent" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:751 +#, java-format +msgid "Alternately, you can copy .torrent files to {0} ." +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:753 +msgid "Removing that .torrent file will cause the torrent to stop." +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:769 +msgid "Create Torrent" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:772 +msgid "Data to seed" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:776 +msgid "File to seed (must be within the specified path)" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:780 +msgid "Select a tracker" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:793 +msgid "or" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:796 +msgid "Custom tracker URL" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:799 +msgid "Create torrent" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:816 +msgid "Configuration" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:819 +msgid "Data directory" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:822 +msgid "Directory to store torrents and data" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:824 +msgid "Edit i2psnark.config and restart to change" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:828 +msgid "Auto start" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:832 +msgid "If checked, automatically start torrents that are added" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:855 +msgid "Total uploader limit" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +msgid "Up bandwidth limit" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:865 +msgid "Half available bandwidth< recommended." +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:867 +msgid "Configure" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:871 +msgid "Use open trackers also" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:875 +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:879 +msgid "Open tracker announce URLs" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:890 +msgid "I2CP host" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:895 +msgid "I2CP port" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:908 +msgid "I2CP options" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:913 +msgid "Save configuration" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:964 #, java-format msgid "Torrent fetched from {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:924 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:991 #, java-format msgid "Torrent at {0} was not valid" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:929 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:996 #, java-format msgid "Torrent was not retrieved from {0}" msgstr "" From e5248b09ab7881c66170d947e85236a52c3f536b Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 10 Dec 2009 18:08:50 +0000 Subject: [PATCH 061/127] add 2-param method, tag the java messages, fix the buttons, clean up add and create forms --- .../src/org/klomp/snark/I2PSnarkUtil.java | 5 + .../src/org/klomp/snark/SnarkManager.java | 95 ++++--- .../org/klomp/snark/web/I2PSnarkServlet.java | 56 ++-- apps/i2psnark/locale/messages_de.po | 247 +++++++++++++++--- core/java/src/net/i2p/util/Translate.java | 22 ++ 5 files changed, 331 insertions(+), 94 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java index 3eafb645e..4cea2ae81 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java +++ b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java @@ -426,4 +426,9 @@ public class I2PSnarkUtil { public String getString(String s, Object o) { return Translate.getString(s, o, _context, BUNDLE_NAME); } + + /** {0} and {1} */ + public String getString(String s, Object o, Object o2) { + return Translate.getString(s, o, o2, _context, BUNDLE_NAME); + } } diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index 2ad0107d6..655282922 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -81,7 +81,7 @@ public class SnarkManager implements Snark.CompleteListener { _peerCoordinatorSet = new PeerCoordinatorSet(); _connectionAcceptor = new ConnectionAcceptor(_util); int minutes = getStartupDelayMinutes(); - _messages.add("Adding torrents in " + minutes + (minutes == 1 ? " minute" : " minutes")); + _messages.add(_("Adding torrents in {0} minutes", minutes)); I2PAppThread monitor = new I2PAppThread(new DirMonitor(), "Snark DirMonitor"); monitor.setDaemon(true); monitor.start(); @@ -217,6 +217,7 @@ public class SnarkManager implements Snark.CompleteListener { 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(); @@ -237,9 +238,9 @@ public class SnarkManager implements Snark.CompleteListener { _util.setMaxUploaders(limit); changed = true; _config.setProperty(PROP_UPLOADERS_TOTAL, "" + limit); - addMessage("Total uploaders limit changed to " + limit); + addMessage(_("Total uploaders limit changed to {0}", limit)); } else { - addMessage("Minimum total uploaders limit is " + Snark.MIN_TOTAL_UPLOADERS); + addMessage(_("Minimum total uploaders limit is {0}", Snark.MIN_TOTAL_UPLOADERS)); } } } @@ -251,9 +252,9 @@ public class SnarkManager implements Snark.CompleteListener { _util.setMaxUpBW(limit); changed = true; _config.setProperty(PROP_UPBW_MAX, "" + limit); - addMessage("Up BW limit changed to " + limit + "KBps"); + addMessage(_("Up BW limit changed to {0}KBps", limit)); } else { - addMessage("Minimum Up BW limit is " + MIN_UP_BW + "KBps"); + addMessage(_("Minimum up bandwidth limit is {0}KBps", MIN_UP_BW)); } } } @@ -297,27 +298,27 @@ public class SnarkManager implements Snark.CompleteListener { } } if (snarksActive) { - addMessage("Cannot change the I2CP settings while torrents are active"); + addMessage(_("Cannot change the I2CP settings while torrents are active")); _log.debug("i2cp host [" + i2cpHost + "] i2cp port " + port + " opts [" + opts + "] oldOpts [" + oldOpts + "]"); } else { if (_util.connected()) { _util.disconnect(); - addMessage("Disconnecting old I2CP destination"); + addMessage(_("Disconnecting old I2CP destination")); } Properties p = new Properties(); p.putAll(opts); - addMessage("I2CP settings changed to " + i2cpHost + ":" + port + " (" + i2cpOpts.trim() + ")"); + addMessage(_("I2CP settings changed to {0}", i2cpHost + ":" + port + " (" + i2cpOpts.trim() + ")")); _util.setI2CPConfig(i2cpHost, port, p); boolean ok = _util.connect(); if (!ok) { - addMessage("Unable to connect with the new settings, reverting to the old I2CP settings"); + addMessage(_("Unable to connect with the new settings, reverting to the old I2CP settings")); _util.setI2CPConfig(oldI2CPHost, oldI2CPPort, oldOpts); ok = _util.connect(); if (!ok) - addMessage("Unable to reconnect with the old settings!"); + addMessage(_("Unable to reconnect with the old settings!")); } else { - addMessage("Reconnected on the new I2CP destination"); + addMessage(_("Reconnected on the new I2CP destination")); _config.setProperty(PROP_I2CP_HOST, i2cpHost.trim()); _config.setProperty(PROP_I2CP_PORT, "" + port); _config.setProperty(PROP_I2CP_OPTS, i2cpOpts.trim()); @@ -328,7 +329,7 @@ public class SnarkManager implements Snark.CompleteListener { Snark snark = getTorrent(name); if ( (snark != null) && (snark.acceptor != null) ) { snark.acceptor.restart(); - addMessage("I2CP listener restarted for " + snark.meta.getName()); + addMessage(_("I2CP listener restarted for \"{0}\"", snark.meta.getName())); } } } @@ -338,26 +339,32 @@ public class SnarkManager implements Snark.CompleteListener { } if (shouldAutoStart() != autoStart) { _config.setProperty(PROP_AUTO_START, autoStart + ""); - addMessage("Adjusted autostart to " + autoStart); + if (autoStart) + addMessage(_("Enabled autostart")); + else + addMessage(_("Disabled autostart")); changed = true; } if (_util.shouldUseOpenTrackers() != useOpenTrackers) { _config.setProperty(I2PSnarkUtil.PROP_USE_OPENTRACKERS, useOpenTrackers + ""); - addMessage((useOpenTrackers ? "En" : "Dis") + "abled open trackers - torrent restart required to take effect."); + if (useOpenTrackers) + addMessage(_("Enabled open trackers - torrent restart required to take effect.")); + else + addMessage(_("Disabled open trackers - torrent restart required to take effect.")); changed = true; } if (openTrackers != null) { if (openTrackers.trim().length() > 0 && !openTrackers.trim().equals(_util.getOpenTrackerString())) { _config.setProperty(I2PSnarkUtil.PROP_OPENTRACKERS, openTrackers.trim()); _util.setOpenTrackerString(openTrackers); - addMessage("Open Tracker list changed - torrent restart required to take effect."); + addMessage(_("Open Tracker list changed - torrent restart required to take effect.")); changed = true; } } if (changed) { saveConfig(); } else { - addMessage("Configuration unchanged."); + addMessage(_("Configuration unchanged.")); } } @@ -367,7 +374,7 @@ public class SnarkManager implements Snark.CompleteListener { DataHelper.storeProps(_config, _configFile); } } catch (IOException ioe) { - addMessage("Unable to save the config to '" + _configFile.getAbsolutePath() + "'."); + addMessage(_("Unable to save the config to {0}", _configFile.getAbsolutePath())); } } @@ -385,10 +392,10 @@ public class SnarkManager implements Snark.CompleteListener { public void addTorrent(String filename) { addTorrent(filename, false); } public void addTorrent(String filename, boolean dontAutoStart) { if ((!dontAutoStart) && !_util.connected()) { - addMessage("Connecting to I2P"); + addMessage(_("Connecting to I2P")); boolean ok = _util.connect(); if (!ok) { - addMessage("Error connecting to I2P - check your I2CP settings!"); + addMessage(_("Error connecting to I2P - check your I2CP settings!")); return; } } @@ -397,7 +404,7 @@ public class SnarkManager implements Snark.CompleteListener { filename = sfile.getCanonicalPath(); } catch (IOException ioe) { _log.error("Unable to add the torrent " + filename, ioe); - addMessage("ERR: Could not add the torrent '" + filename + "': " + ioe.getMessage()); + addMessage(_("Error: Could not add the torrent {0}", filename) + ": " + ioe.getMessage()); return; } File dataDir = getDataDir(); @@ -436,7 +443,7 @@ public class SnarkManager implements Snark.CompleteListener { } } } catch (IOException ioe) { - addMessage("Torrent in " + sfile.getName() + " is invalid: " + ioe.getMessage()); + addMessage(_("Torrent in \"{0}\" is invalid", sfile.getName()) + ": " + ioe.getMessage()); if (sfile.exists()) sfile.delete(); return; @@ -451,9 +458,9 @@ public class SnarkManager implements Snark.CompleteListener { File f = new File(filename); if (!dontAutoStart && shouldAutoStart()) { torrent.startTorrent(); - addMessage("Torrent added and started: '" + f.getName() + "'."); + addMessage(_("Torrent added and started: \"{0}\"", f.getName())); } else { - addMessage("Torrent added: '" + f.getName() + "'."); + addMessage(_("Torrent added: \"{0}\"", f.getName())); } } @@ -549,19 +556,19 @@ public class SnarkManager implements Snark.CompleteListener { // basic validation of url if ((!announce.startsWith("http://")) || (announce.indexOf(".i2p/") < 0)) // need to do better than this - return "Non-i2p tracker in " + info.getName() + ", deleting it from our list of trackers!"; + return _("Non-i2p tracker in \"{0}\", deleting it from our list of trackers!", info.getName()); List files = info.getFiles(); if ( (files != null) && (files.size() > MAX_FILES_PER_TORRENT) ) { - return "Too many files in " + info.getName() + " (" + files.size() + "), deleting it!"; + return _("Too many files in \"{0}\" ({1}), deleting it!", info.getName(), files.size()); } else if ( (files == null) && (info.getName().endsWith(".torrent")) ) { - return "Torrent file " + info.getName() + " cannot end in '.torrent', deleting it!"; + return _("Torrent file \"{0}\" cannot end in '.torrent', deleting it!", info.getName()); } else if (info.getPieces() <= 0) { - return "No pieces in " + info.getName() + "? deleting it!"; + return _("No pieces in \"{0}\", deleting it!", info.getName()); } else if (info.getPieces() > Storage.MAX_PIECES) { - return "Too many pieces in " + info.getName() + ", limit is " + Storage.MAX_PIECES + ", deleting it!"; + 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 " + info.getName() + " (" + DataHelper.formatSize(info.getPieceLength(0)) + - "B, limit is " + DataHelper.formatSize(Storage.MAX_PIECE_SIZE) + "B), deleting it."; + 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)); } else if (info.getTotalLength() > Storage.MAX_TOTAL_SIZE) { System.out.println("torrent info: " + info.toString()); List lengths = info.getLengths(); @@ -569,8 +576,7 @@ public class SnarkManager implements Snark.CompleteListener { for (int i = 0; i < lengths.size(); i++) System.out.println("File " + i + " is " + lengths.get(i) + " long."); - return "Torrents larger than " + DataHelper.formatSize(Storage.MAX_TOTAL_SIZE) + - "B are not supported yet (because we're paranoid): " + info.getName() + ", deleting it!"; + return _("Torrents larger than {0}B are not supported yet, deleting \"{1}\"", Storage.MAX_TOTAL_SIZE, info.getName()); } else { // ok return null; @@ -586,7 +592,7 @@ public class SnarkManager implements Snark.CompleteListener { filename = sfile.getCanonicalPath(); } catch (IOException ioe) { _log.error("Unable to remove the torrent " + filename, ioe); - addMessage("ERR: Could not remove the torrent '" + filename + "': " + ioe.getMessage()); + addMessage(_("Error: Could not remove the torrent {0}", filename) + ": " + ioe.getMessage()); return null; } int remaining = 0; @@ -607,7 +613,7 @@ public class SnarkManager implements Snark.CompleteListener { ////_util. } if (!wasStopped) - addMessage("Torrent stopped: '" + sfile.getName() + "'."); + addMessage(_("Torrent stopped: \"{0}\"", sfile.getName())); } return torrent; } @@ -622,7 +628,7 @@ public class SnarkManager implements Snark.CompleteListener { torrentFile.delete(); if (torrent.storage != null) removeTorrentStatus(torrent.storage.getMetaInfo()); - addMessage("Torrent removed: '" + torrentFile.getName() + "'."); + addMessage(_("Torrent removed: \"{0}\"", torrentFile.getName())); } } @@ -655,7 +661,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: " + f.getName() + " (size: " + DataHelper.formatSize(len) + "B)"); + addMessage(_("Download finished: \"{0}\"", f.getName()) + " (" + _("size: {0}B", DataHelper.formatSize(len)) + ')'); updateStatus(snark); } @@ -683,7 +689,7 @@ public class SnarkManager implements Snark.CompleteListener { // already known. noop } else { if (shouldAutoStart() && !_util.connect()) - addMessage("Unable to connect to I2P!"); + addMessage(_("Unable to connect to I2P!")); addTorrent((String)foundNames.get(i), !shouldAutoStart()); } } @@ -699,6 +705,21 @@ public class SnarkManager implements Snark.CompleteListener { } } + /** translate */ + private String _(String s) { + return _util.getString(s); + } + + /** translate */ + private String _(String s, Object o) { + return _util.getString(s, o); + } + + /** translate */ + private String _(String s, Object o, Object o2) { + return _util.getString(s, o, o2); + } + /** * "name", "announceURL=websiteURL" pairs */ diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index 0cf576a18..b613a04cc 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -215,7 +215,7 @@ public class I2PSnarkServlet extends HttpServlet { String action = req.getParameter("action"); if (action == null) { // noop - } else if ("Add torrent".equals(action)) { + } else if (_("Add torrent").equals(action)) { String newFile = req.getParameter("newFile"); String newURL = req.getParameter("newURL"); // NOTE - newFile currently disabled in HTML form - see below @@ -259,7 +259,7 @@ public class I2PSnarkServlet extends HttpServlet { } else { // no file or URL specified } - } else if ("Stop".equals(action)) { + } else if (_("Stop").equals(action)) { String torrent = req.getParameter("torrent"); if (torrent != null) { byte infoHash[] = Base64.decode(torrent); @@ -274,7 +274,7 @@ public class I2PSnarkServlet extends HttpServlet { } } } - } else if ("Start".equals(action)) { + } else if (_("Start").equals(action)) { String torrent = req.getParameter("torrent"); if (torrent != null) { byte infoHash[] = Base64.decode(torrent); @@ -356,7 +356,7 @@ public class I2PSnarkServlet extends HttpServlet { } } } - } else if ("Save configuration".equals(action)) { + } else if (_("Save configuration").equals(action)) { String dataDir = req.getParameter("dataDir"); boolean autoStart = req.getParameter("autoStart") != null; String seedPct = req.getParameter("seedPct"); @@ -370,7 +370,7 @@ public class I2PSnarkServlet extends HttpServlet { 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); - } else if ("Create torrent".equals(action)) { + } else if (_("Create torrent").equals(action)) { String baseData = req.getParameter("baseFile"); if (baseData != null && baseData.trim().length() > 0) { File baseFile = new File(_manager.getDataDir(), baseData); @@ -395,12 +395,12 @@ public class I2PSnarkServlet extends HttpServlet { FileOutputStream out = new FileOutputStream(torrentFile); out.write(info.getTorrentData()); out.close(); - _manager.addMessage(_("Torrent created for {0}", baseFile.getName()) + ": " + torrentFile.getAbsolutePath()); + _manager.addMessage(_("Torrent created for \"{0}\"", baseFile.getName()) + ": " + torrentFile.getAbsolutePath()); // now fire it up, but don't automatically seed it _manager.addTorrent(torrentFile.getCanonicalPath(), true); - _manager.addMessage(_("Many I2P trackers require you to register new torrents before seeding - please do so before starting {0}", baseFile.getName())); + _manager.addMessage(_("Many I2P trackers require you to register new torrents before seeding - please do so before starting \"{0}\"", baseFile.getName())); } catch (IOException ioe) { - _manager.addMessage(_("Error creating a torrent for {0}", baseFile.getAbsolutePath()) + ": " + ioe.getMessage()); + _manager.addMessage(_("Error creating a torrent for \"{0}\"", baseFile.getAbsolutePath()) + ": " + ioe.getMessage()); } } else { _manager.addMessage(_("Cannot create a torrent for the nonexistent data: {0}", baseFile.getAbsolutePath())); @@ -739,19 +739,19 @@ public class I2PSnarkServlet extends HttpServlet { out.write("\n"); out.write("
      "); out.write(_("Add Torrent")); - out.write("
      \n"); + out.write("
      \n
      "); out.write(_("From URL")); - out.write(": \n"); + out.write(": \n"); // not supporting from file at the moment, since the file name passed isn't always absolute (so it may not resolve) //out.write("From file:
      \n"); - out.write("      		 
      \n"); - out.write(""); - out.write(_("Alternately, you can copy .torrent files to {0} .", _manager.getDataDir().getAbsolutePath())); - out.write("
      \n"); - out.write(_("Removing that .torrent file will cause the torrent to stop.")); - out.write("
      \n"); + out.write("
       "); + out.write(_("Alternately, you can copy .torrent files to the directory {0}.", _manager.getDataDir().getAbsolutePath())); + out.write("\n"); + out.write(_("Removing a .torrent file will cause the torrent to stop.")); + out.write("
      \n"); out.write("\n
      "); } @@ -767,16 +767,16 @@ public class I2PSnarkServlet extends HttpServlet { out.write("\n"); out.write(""); out.write(_("Create Torrent")); - out.write("
      \n"); + out.write("
      \n
      "); //out.write("From file:
      \n"); out.write(_("Data to seed")); - out.write(": " + _manager.getDataDir().getAbsolutePath() + File.separatorChar + out.write(":      		" + _manager.getDataDir().getAbsolutePath() + File.separatorChar + "
      \n"); + out.write(_("File or directory to seed (must be within the specified path)")); + out.write("\" >
      \n"); out.write(_("Tracker")); - out.write(": \n"); out.write(_("or")); - out.write("   "); - out.write(" \n"); + out.write("\" name=\"action\" >
      \n"); out.write("\n"); } @@ -862,9 +862,9 @@ public class I2PSnarkServlet extends HttpServlet { out.write(_("Up bandwidth limit")); out.write(":       		KBps ("); - out.write(_("Half available bandwidth< recommended.")); + out.write(_("Half available bandwidth recommended.")); out.write(" "); - out.write(_("Configure")); + out.write(_("View or change router bandwidth")); out.write(")
      \n"); out.write("
      "); @@ -916,10 +916,12 @@ public class I2PSnarkServlet extends HttpServlet { out.write(""); } + /** translate */ private String _(String s) { return _manager.util().getString(s); } + /** translate */ private String _(String s, Object o) { return _manager.util().getString(s, o); } diff --git a/apps/i2psnark/locale/messages_de.po b/apps/i2psnark/locale/messages_de.po index f501c93f1..e238b3cf6 100644 --- a/apps/i2psnark/locale/messages_de.po +++ b/apps/i2psnark/locale/messages_de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P i2psnark\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-10 14:50+0000\n" +"POT-Creation-Date: 2009-12-10 17:41+0000\n" "PO-Revision-Date: 2009-10-19 12:50+0000\n" "Last-Translator: foo \n" "Language-Team: foo \n" @@ -17,6 +17,188 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: German\n" +#: ../java/src/org/klomp/snark/SnarkManager.java:84 +#, java-format +msgid "Adding torrents in {0} minutes" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:241 +#, java-format +msgid "Total uploaders limit changed to {0}" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:243 +#, java-format +msgid "Minimum total uploaders limit is {0}" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:255 +#, java-format +msgid "Up BW limit changed to {0}KBps" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:257 +#, java-format +msgid "Minimum up bandwidth limit is {0}KBps" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:301 +msgid "Cannot change the I2CP settings while torrents are active" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:307 +msgid "Disconnecting old I2CP destination" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:311 +#, java-format +msgid "I2CP settings changed to {0}" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:315 +msgid "" +"Unable to connect with the new settings, reverting to the old I2CP settings" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:319 +msgid "Unable to reconnect with the old settings!" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:321 +msgid "Reconnected on the new I2CP destination" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:332 +#, java-format +msgid "I2CP listener restarted for \"{0}\"" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:343 +msgid "Enabled autostart" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:345 +msgid "Disabled autostart" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:351 +msgid "Enabled open trackers - torrent restart required to take effect." +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:353 +msgid "Disabled open trackers - torrent restart required to take effect." +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:360 +msgid "Open Tracker list changed - torrent restart required to take effect." +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:367 +msgid "Configuration unchanged." +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:377 +#, java-format +msgid "Unable to save the config to {0}" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:395 +msgid "Connecting to I2P" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:398 +msgid "Error connecting to I2P - check your I2CP settings!" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:407 +#, java-format +msgid "Error: Could not add the torrent {0}" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:446 +#, java-format +msgid "Torrent in \"{0}\" is invalid" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:461 +#, java-format +msgid "Torrent added and started: \"{0}\"" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:463 +#, java-format +msgid "Torrent added: \"{0}\"" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:559 +#, java-format +msgid "Non-i2p tracker in \"{0}\", deleting it from our list of trackers!" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:562 +#, java-format +msgid "Too many files in \"{0}\" ({1}), deleting it!" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:564 +#, java-format +msgid "Torrent file \"{0}\" cannot end in '.torrent', deleting it!" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:566 +#, java-format +msgid "No pieces in \"{0}\", deleting it!" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:568 +#, java-format +msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:570 +#, java-format +msgid "Pieces are too large in \"{0}\" ({1}B), deleting it." +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:571 +#, java-format +msgid "Limit is {0}B" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:579 +#, java-format +msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\"" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:595 +#, java-format +msgid "Error: Could not remove the torrent {0}" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:616 +#, java-format +msgid "Torrent stopped: \"{0}\"" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:631 +#, java-format +msgid "Torrent removed: \"{0}\"" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:664 +#, java-format +msgid "Download finished: \"{0}\"" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:664 +#, java-format +msgid "size: {0}B" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:692 +msgid "Unable to connect to I2P!" +msgstr "" + #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:86 msgid "I2PSnark - Anonymous BitTorrent Client" msgstr "" @@ -104,19 +286,24 @@ msgstr "" msgid "{0} connected peers" msgstr "" +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:218 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:748 +msgid "Add torrent" +msgstr "" + #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:226 #, java-format msgid "Torrent file {0} does not exist" msgstr "" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:236 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:983 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985 #, java-format msgid "Torrent already running: {0}" msgstr "" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:238 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:987 #, java-format msgid "Torrent already in the queue: {0}" msgstr "" @@ -145,6 +332,16 @@ msgstr "" msgid "Invalid URL - must start with http://" msgstr "" +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:262 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 +msgid "Stop" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:277 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:623 +msgid "Start" +msgstr "" + #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:287 #, java-format msgid "Starting up torrent {0}" @@ -173,25 +370,35 @@ msgstr "" msgid "Data dir deleted: {0}" msgstr "" +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:359 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:913 +msgid "Save configuration" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:373 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:799 +msgid "Create torrent" +msgstr "" + #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:383 msgid "Error creating torrent - you must select a tracker" msgstr "" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:398 #, java-format -msgid "Torrent created for {0}" +msgid "Torrent created for \"{0}\"" msgstr "" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:401 #, java-format msgid "" "Many I2P trackers require you to register new torrents before seeding - " -"please do so before starting {0}" +"please do so before starting \"{0}\"" msgstr "" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:403 #, java-format -msgid "Error creating a torrent for {0}" +msgid "Error creating a torrent for \"{0}\"" msgstr "" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:406 @@ -285,18 +492,10 @@ msgstr "" msgid "Stop the torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 -msgid "Stop" -msgstr "" - #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:621 msgid "Start the torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:623 -msgid "Start" -msgstr "" - #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628 msgid "Remove the torrent from the active list, deleting the .torrent file" msgstr "" @@ -341,17 +540,13 @@ msgstr "" msgid "From URL" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:748 -msgid "Add torrent" -msgstr "" - #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:751 #, java-format msgid "Alternately, you can copy .torrent files to {0} ." msgstr "" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:753 -msgid "Removing that .torrent file will cause the torrent to stop." +msgid "Removing a .torrent file will cause the torrent to stop." msgstr "" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:769 @@ -378,10 +573,6 @@ msgstr "" msgid "Custom tracker URL" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:799 -msgid "Create torrent" -msgstr "" - #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:816 msgid "Configuration" msgstr "" @@ -448,21 +639,17 @@ msgstr "" msgid "I2CP options" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:913 -msgid "Save configuration" -msgstr "" - -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:964 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:966 #, java-format msgid "Torrent fetched from {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:991 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:993 #, java-format msgid "Torrent at {0} was not valid" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:996 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:998 #, java-format msgid "Torrent was not retrieved from {0}" msgstr "" diff --git a/core/java/src/net/i2p/util/Translate.java b/core/java/src/net/i2p/util/Translate.java index 47f555077..75803968a 100644 --- a/core/java/src/net/i2p/util/Translate.java +++ b/core/java/src/net/i2p/util/Translate.java @@ -76,6 +76,28 @@ public abstract class Translate { } } + /** for {0} and {1} */ + public static String getString(String s, Object o, Object o2, I2PAppContext ctx, String bun) { + String lang = getLanguage(ctx); + if (lang.equals(TEST_LANG)) + return TEST_STRING + '(' + o + ',' + o2 + ')' + TEST_STRING; + String x = getString(s, ctx, bun); + Object[] oArray = new Object[2]; + oArray[0] = o; + oArray[1] = o2; + try { + MessageFormat fmt = new MessageFormat(x, new Locale(lang)); + return fmt.format(oArray, new StringBuffer(), null).toString(); + } catch (IllegalArgumentException iae) { + System.err.println("Bad format: orig: \"" + s + + "\" trans: \"" + x + + "\" param1: \"" + o + + "\" param2: \"" + o2 + + "\" lang: " + lang); + return "FIXME: " + x + ' ' + o + ',' + o2; + } + } + /** @return lang in routerconsole.lang property, else current locale */ public static String getLanguage(I2PAppContext ctx) { String lang = ctx.getProperty(PROP_LANG); From 7cc75c0cb9e938457897503257dc18674181c32e Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 11 Dec 2009 00:42:25 +0000 Subject: [PATCH 062/127] html fix --- .../src/org/klomp/snark/web/I2PSnarkServlet.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index b613a04cc..305a9eb06 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -123,18 +123,19 @@ public class I2PSnarkServlet extends HttpServlet { String uri = req.getRequestURI(); out.write(TABLE_HEADER); out.write(_("Status")); - out.write("\n"); if (_manager.util().connected() && snarks.size() > 0) { - out.write("("); - if (peerParam != null) + if (peerParam != null) { + out.write("\">"); out.write(_("Hide Peers")); - else + } else { + out.write("?p=1\">"); out.write(_("Show Peers")); + } out.write(")
      \n"); } - out.write("      		"); + out.write(""); out.write(_("Torrent")); out.write(""); out.write(_("ETA")); From 6029e1a29126d0e919d9847c57c4a0b4f1929d71 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 11 Dec 2009 18:00:34 +0000 Subject: [PATCH 063/127] * Fragmenter: Pull the new comments, new stats, and debug log fix from i2p.i2p.zzz.batch in - but not the batching mods, which need a fresh look. --- .../router/tunnel/BatchedPreprocessor.java | 79 +++++++++++++++---- .../i2p/router/tunnel/TunnelDispatcher.java | 3 + 2 files changed, 65 insertions(+), 17 deletions(-) diff --git a/router/java/src/net/i2p/router/tunnel/BatchedPreprocessor.java b/router/java/src/net/i2p/router/tunnel/BatchedPreprocessor.java index 751d629a5..37c173c75 100644 --- a/router/java/src/net/i2p/router/tunnel/BatchedPreprocessor.java +++ b/router/java/src/net/i2p/router/tunnel/BatchedPreprocessor.java @@ -13,6 +13,36 @@ import net.i2p.util.Log; * after the delay there still isn't enough data, what is available is sent * and padded. * + * As explained in the tunnel document, the preprocessor has a lot of + * potential flexibility in delay, padding, or even reordering. + * We keep things relatively simple for now. + * + * However much of the efficiency results from the clients selecting + * the correct MTU in the streaming lib such that the maximum-size + * streaming lib message fits in an integral number of tunnel messages. + * See ConnectionOptions in the streaming lib for details. + * + * Aside from obvious goals of minimizing delay and padding, we also + * want to minimize the number of tunnel messages a message occupies, + * to minimize the impact of a router dropping a tunnel message. + * So there is some benefit in starting a message in a new tunnel message, + * especially if it will fit perfectly if we do that (a 964 or 1956 byte + * message, for example). + * + * An idea for the future... + * + * If we are in the middle of a tunnel msg and starting a new i2np msg, + * and this one won't fit, + * let's look to see if we have somthing that would fit instead + * by reordering: + * if (allocated > 0 && msg.getFragment == 0) { + * for (j = i+1, j < pending.size(); j++) { + * if it will fit and it is fragment 0 { + * msg = pending.remove(j) + * pending.add(0, msg) + * } + * } + * } */ public class BatchedPreprocessor extends TrivialPreprocessor { private Log _log; @@ -24,13 +54,18 @@ public class BatchedPreprocessor extends TrivialPreprocessor { _log = ctx.logManager().getLog(BatchedPreprocessor.class); _name = name; _pendingSince = 0; - ctx.statManager().createRateStat("tunnel.batchMultipleCount", "How many messages are batched into a tunnel message", "Tunnels", new long[] { 10*60*1000, 60*60*1000, 24*60*60*1000 }); - ctx.statManager().createRateStat("tunnel.batchDelay", "How many messages were pending when the batching waited", "Tunnels", new long[] { 10*60*1000, 60*60*1000, 24*60*60*1000 }); - ctx.statManager().createRateStat("tunnel.batchDelaySent", "How many messages were flushed when the batching delay completed", "Tunnels", new long[] { 10*60*1000, 60*60*1000, 24*60*60*1000 }); - ctx.statManager().createRateStat("tunnel.batchCount", "How many groups of messages were flushed together", "Tunnels", new long[] { 60*1000, 10*60*1000, 60*60*1000, 24*60*60*1000 }); - ctx.statManager().createRateStat("tunnel.batchDelayAmount", "How long we should wait before flushing the batch", "Tunnels", new long[] { 60*1000, 10*60*1000, 60*60*1000, 24*60*60*1000 }); - ctx.statManager().createRateStat("tunnel.batchFlushRemaining", "How many messages remain after flushing", "Tunnels", new long[] { 60*1000, 10*60*1000, 60*60*1000, 24*60*60*1000 }); - ctx.statManager().createRateStat("tunnel.writeDelay", "How long after a message reaches the gateway is it processed (lifetime is size)", "Tunnels", new long[] { 60*1000, 10*60*1000, 60*60*1000, 24*60*60*1000 }); + ctx.statManager().createRateStat("tunnel.batchMultipleCount", "How many messages are batched into a tunnel message", "Tunnels", new long[] { 10*60*1000, 60*60*1000 }); + ctx.statManager().createRateStat("tunnel.batchDelay", "How many messages were pending when the batching waited", "Tunnels", new long[] { 10*60*1000, 60*60*1000 }); + ctx.statManager().createRateStat("tunnel.batchDelaySent", "How many messages were flushed when the batching delay completed", "Tunnels", new long[] { 10*60*1000, 60*60*1000 }); + ctx.statManager().createRateStat("tunnel.batchCount", "How many groups of messages were flushed together", "Tunnels", new long[] { 10*60*1000, 60*60*1000 }); + ctx.statManager().createRateStat("tunnel.batchDelayAmount", "How long we should wait before flushing the batch", "Tunnels", new long[] { 10*60*1000, 60*60*1000 }); + ctx.statManager().createRateStat("tunnel.batchFlushRemaining", "How many messages remain after flushing", "Tunnels", new long[] { 10*60*1000, 60*60*1000 }); + ctx.statManager().createRateStat("tunnel.writeDelay", "How long after a message reaches the gateway is it processed (lifetime is size)", "Tunnels", new long[] { 10*60*1000, 60*60*1000 }); + ctx.statManager().createRateStat("tunnel.batchSmallFragments", "How many outgoing pad bytes are in small fragments?", + "Tunnels", new long[] { 10*60*1000l, 60*60*1000l }); + ctx.statManager().createRateStat("tunnel.batchFullFragments", "How many outgoing tunnel messages use the full data area?", + "Tunnels", new long[] { 10*60*1000l, 60*60*1000l }); + ctx.statManager().createRateStat("tunnel.batchFragmentation", "Avg. number of fragments per msg", "Tunnels", new long[] { 10*60*1000, 60*60*1000 }); } private static final int FULL_SIZE = PREPROCESSED_SIZE @@ -38,11 +73,11 @@ public class BatchedPreprocessor extends TrivialPreprocessor { - 1 // 0x00 ending the padding - 4; // 4 byte checksum - private static final boolean DISABLE_BATCHING = false; + //private static final boolean DISABLE_BATCHING = false; /* not final or private so the test code can adjust */ static long DEFAULT_DELAY = 100; - /** wait up to 2 seconds before sending a small message */ + /** Wait up to this long before sending (flushing) a small tunnel message */ protected long getSendDelay() { return DEFAULT_DELAY; } /** if we have 50 messages queued that are too small, flush them anyway */ @@ -71,11 +106,11 @@ public class BatchedPreprocessor extends TrivialPreprocessor { timingBuf = new StringBuilder(128); timingBuf.append("Preprocess with " + pending.size() + " to send. "); } - if (DISABLE_BATCHING) { - if (_log.shouldLog(Log.INFO)) - _log.info("Disabled batching, pushing " + pending + " immediately"); - return super.preprocessQueue(pending, sender, rec); - } + //if (DISABLE_BATCHING) { + // if (_log.shouldLog(Log.INFO)) + // _log.info("Disabled batching, pushing " + pending + " immediately"); + // return super.preprocessQueue(pending, sender, rec); + //} long start = System.currentTimeMillis(); int batchCount = 0; @@ -112,6 +147,7 @@ public class BatchedPreprocessor extends TrivialPreprocessor { long beforeSend = System.currentTimeMillis(); _pendingSince = 0; send(pending, 0, i, sender, rec); + _context.statManager().addRateData("tunnel.batchFullFragments", 1, 0); long afterSend = System.currentTimeMillis(); if (_log.shouldLog(Log.INFO)) _log.info("Allocated=" + allocated + " so we sent " + (i+1) @@ -126,6 +162,7 @@ public class BatchedPreprocessor extends TrivialPreprocessor { if (timingBuf != null) timingBuf.append(" sent " + cur); notePreprocessing(cur.getMessageId(), cur.getFragmentNumber(), cur.getData().length, cur.getMessageIds(), "flushed allocated"); + _context.statManager().addRateData("tunnel.batchFragmentation", cur.getFragmentNumber() + 1, 0); _context.statManager().addRateData("tunnel.writeDelay", cur.getLifetime(), cur.getData().length); } if (msg.getOffset() >= msg.getData().length) { @@ -134,6 +171,7 @@ public class BatchedPreprocessor extends TrivialPreprocessor { if (timingBuf != null) timingBuf.append(" sent perfect fit " + cur).append("."); notePreprocessing(cur.getMessageId(), cur.getFragmentNumber(), msg.getData().length, msg.getMessageIds(), "flushed tail, remaining: " + pending); + _context.statManager().addRateData("tunnel.batchFragmentation", cur.getFragmentNumber() + 1, 0); _context.statManager().addRateData("tunnel.writeDelay", cur.getLifetime(), cur.getData().length); } if (i > 0) @@ -169,6 +207,7 @@ public class BatchedPreprocessor extends TrivialPreprocessor { _context.statManager().addRateData("tunnel.batchDelaySent", pending.size(), 0); send(pending, 0, pending.size()-1, sender, rec); + _context.statManager().addRateData("tunnel.batchSmallFragments", FULL_SIZE - allocated, 0); int beforeSize = pending.size(); for (int i = 0; i < pending.size(); i++) { @@ -176,6 +215,7 @@ public class BatchedPreprocessor extends TrivialPreprocessor { if (cur.getOffset() >= cur.getData().length) { pending.remove(i); notePreprocessing(cur.getMessageId(), cur.getFragmentNumber(), cur.getData().length, cur.getMessageIds(), "flushed remaining"); + _context.statManager().addRateData("tunnel.batchFragmentation", cur.getFragmentNumber() + 1, 0); _context.statManager().addRateData("tunnel.writeDelay", cur.getLifetime(), cur.getData().length); i--; } @@ -330,10 +370,15 @@ public class BatchedPreprocessor extends TrivialPreprocessor { + " leaving " + (msg.getData().length - msg.getOffset()) + " bytes for later"); } else { offset = writeSubsequentFragment(msg, target, offset); - if (_log.shouldLog(Log.DEBUG)) - _log.debug("writing " + msg.getMessageId() + " fragment " + (msg.getFragmentNumber()-1) + if (_log.shouldLog(Log.DEBUG)) { + int frag = msg.getFragmentNumber(); + int later = msg.getData().length - msg.getOffset(); + if (later > 0) + frag--; + _log.debug("writing " + msg.getMessageId() + " fragment " + frag + ", ending at " + offset + " prev " + prevOffset - + " leaving " + (msg.getData().length - msg.getOffset()) + " bytes for later"); + + " leaving " + later + " bytes for later"); + } } } return offset; diff --git a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java index 3cb4fc9ab..681dadec1 100644 --- a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java +++ b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java @@ -528,6 +528,9 @@ public class TunnelDispatcher implements Service { long tooOld = tooYoung - 9*60*1000; for (int i = 0; i < size; i++) { HopConfig cfg = participating.get(i); + // rare NPE seen here, guess CHS.values() isn't atomic? + if (cfg == null) + continue; long c = cfg.getRecentMessagesCount(); bw += c; bwOut += cfg.getRecentSentMessagesCount(); From 1cec793217839ca004395712873f303eecf1724c Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 11 Dec 2009 18:26:53 +0000 Subject: [PATCH 064/127] add missing file, prop history, -2 --- .../src/java/src/i2p/susi/dns/Messages.java | 37 +++++++++++++++++ history.txt | 41 +++++++++++++++++++ .../src/net/i2p/router/RouterVersion.java | 2 +- 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 apps/susidns/src/java/src/i2p/susi/dns/Messages.java diff --git a/apps/susidns/src/java/src/i2p/susi/dns/Messages.java b/apps/susidns/src/java/src/i2p/susi/dns/Messages.java new file mode 100644 index 000000000..2426606af --- /dev/null +++ b/apps/susidns/src/java/src/i2p/susi/dns/Messages.java @@ -0,0 +1,37 @@ +package i2p.susi.dns; + +import net.i2p.I2PAppContext; +import net.i2p.util.Translate; + +/** + * Translate strings for this package. + */ +public class Messages { + private static final String BUNDLE_NAME = "i2p.susi.dns.messages"; + private final I2PAppContext _context; + + public Messages() { + _context = I2PAppContext.getGlobalContext(); + } + + /** lang in routerconsole.lang property, else current locale */ + public String _(String key) { + return Translate.getString(key, _context, BUNDLE_NAME); + } + + /** + * translate a string with a parameter + * This is a lot more expensive than getString(s, ctx), so use sparingly. + * + * @param s string to be translated containing {0} + * The {0} will be replaced by the parameter. + * Single quotes must be doubled, i.e. ' -> '' in the string. + * @param o parameter, not translated. + * To tranlslate parameter also, use _("foo {0} bar", _("baz")) + * Do not double the single quotes in the parameter. + * Use autoboxing to call with ints, longs, floats, etc. + */ + public String _(String s, Object o) { + return Translate.getString(s, o, _context, BUNDLE_NAME); + } +} diff --git a/history.txt b/history.txt index 7e4a661b0..dcf850ba3 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,44 @@ +2009-12-11 zzz + * Addressbook, susidns: Rework addressbook into a + HttpServlet, so susidns can kick it when the subscription + list changes + * Build: Truncate the history in the updater (-80KB) + * Console: + - Add a nicer handler for missing webapps + - Restore the restart message + - Change "depth" to "length" + * Data: Cache the Hash hashcode + * EepGet: Use InternalSocket if available + * Fragmenter: Pull the new comments, new stats, and + debug log fix from i2p.i2p.zzz.batch in - but not the + batching mods, which need a fresh look. + * I2CP: Implement an internal "socket" class that + allows clients in the same JVM to connect to the + router without going through the kernel + * I2NP: Drop unused classes + * i2psnark: + - Translation support + - Tweak torrent name popup + * I2PTunnel: + - Translation support + - Switch all I2PThreads to I2PAppThreads + - Run an InternalSocket as well for the HTTP Proxy + * Naming Services: + - New EepGetAndAddNamingService that appends new + hosts to hosts.txt + - Move default reverseLookup to base class + - Deprecate unused services + * NetDb: + - Switch from ArrayList to ConcurrentHashSet in + KBucketImpl to reduce chance of deadlock; + remove periodic shuffling of the bucket, + needs to be addressed elsewhere + * SusiDNS: + - Translation support + - Remove jsp's from the war + * Translation: Move code from routerconsole to core, + to support translation of other webapps + * 2009-12-08 0.7.8 released 2009-12-08 zzz diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index b74a3a021..bd644cee5 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 1; + public final static long BUILD = 2; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; From 993fa5c2104f378bb28d6b6d586657766c3d71be Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 11 Dec 2009 19:03:30 +0000 Subject: [PATCH 065/127] fix all summary bar relative links --- .../i2p/router/web/SummaryBarRenderer.java | 44 ++++++++++--------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java index bbffa6c9d..8643a9c0c 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java @@ -19,10 +19,14 @@ public class SummaryBarRenderer { _helper = helper; } + /** + * Note - ensure all links in here are absolute, as the summary bar may be displayed + * on lower-level directory errors. + */ public void renderSummaryHTML(Writer out) throws IOException { StringBuilder buf = new StringBuilder(8*1024); - buf.append("\"")\"")" + - "
      ") .append(_("Addressbook")) .append("\n" + - "") .append(_("Torrents")) .append("\n" + - "") .append(_("Webmail")) @@ -68,7 +72,7 @@ public class SummaryBarRenderer { .append(_("Webserver")) .append("
      \n" + - "

      ") .append(_("I2P Internals")) @@ -76,49 +80,49 @@ public class SummaryBarRenderer { "
      \n" + - "") .append(_("Tunnels")) .append("\n" + - "") .append(_("Peers")) .append("\n" + - "") .append(_("Profiles")) .append("\n" + - "") .append(_("NetDB")) .append("\n" + - "") .append(_("Logs")) .append("\n" + - "") .append(_("Jobs")) .append("\n" + - "") .append(_("Graphs")) .append("\n" + - "") .append(_("Stats")) @@ -130,7 +134,7 @@ public class SummaryBarRenderer { - buf.append("

      ") .append(_("General")) @@ -141,7 +145,7 @@ public class SummaryBarRenderer { .append(_helper.getIdent()) .append(", ") .append(_("never reveal it to anyone")) - .append("\" href=\"netdb.jsp?r=.\" target=\"_top\">") + .append("\" href=\"/netdb.jsp?r=.\" target=\"_top\">") .append(_("Local Identity")) .append("

      \n" + @@ -163,7 +167,7 @@ public class SummaryBarRenderer { .append(_helper.getUptime()) .append("

      \n" + - "

      ") .append(_helper.getReachability()) @@ -217,7 +221,7 @@ public class SummaryBarRenderer { buf.append("

      ") .append(ConfigRestartBean.renderStatus(_helper.getRequestURI(), _helper.getAction(), _helper.getConsoleNonce())) - .append("

      ") .append(_("Peers")) @@ -266,7 +270,7 @@ public class SummaryBarRenderer { boolean anotherLine = false; if (_helper.showFirewallWarning()) { - buf.append("

      ") .append(_("Check NAT/firewall")) @@ -305,7 +309,7 @@ public class SummaryBarRenderer { buf.append("
      "); - buf.append("

      ") .append(_("Bandwidth in/out")) @@ -340,7 +344,7 @@ public class SummaryBarRenderer { .append(_helper.getOutboundTransferred()) .append("

      \n" + - "

      ") .append(_("Tunnels in/out")) From c3dc76e35fa71b5215d4cc72602a07e57619eca2 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 12 Dec 2009 01:36:57 +0000 Subject: [PATCH 066/127] disable internal sockets until I can fix the borkenness --- core/java/src/net/i2p/util/InternalSocket.java | 10 +++++----- history.txt | 3 +++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/core/java/src/net/i2p/util/InternalSocket.java b/core/java/src/net/i2p/util/InternalSocket.java index 26280f254..52b028c11 100644 --- a/core/java/src/net/i2p/util/InternalSocket.java +++ b/core/java/src/net/i2p/util/InternalSocket.java @@ -34,12 +34,12 @@ public class InternalSocket extends Socket { * Convenience method to return either a Socket or an InternalSocket */ public static Socket getSocket(String host, int port) throws IOException { - if (System.getProperty("router.version") != null && - (host.equals("127.0.0.1") || host.equals("localhost"))) { - return new InternalSocket(port); - } else { + //if (System.getProperty("router.version") != null && + // (host.equals("127.0.0.1") || host.equals("localhost"))) { + // return new InternalSocket(port); + //} else { return new Socket(host, port); - } + //} } @Override diff --git a/history.txt b/history.txt index dcf850ba3..aa9bf922b 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2009-12-12 zzz + * Disable InternalSockets until it's fixed + 2009-12-11 zzz * Addressbook, susidns: Rework addressbook into a HttpServlet, so susidns can kick it when the subscription diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index bd644cee5..ef84e9e97 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 2; + public final static long BUILD = 3; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; From c4bb84058af48553b6f3256b513706c98b551c25 Mon Sep 17 00:00:00 2001 From: dev Date: Sat, 12 Dec 2009 17:49:54 +0000 Subject: [PATCH 067/127] sort peers per country --- .../net/i2p/router/web/TunnelRenderer.java | 19 ++++++++++++++++++- history.txt | 1 + 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java index 9091e072f..74a585d48 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java @@ -23,6 +23,7 @@ import net.i2p.router.TunnelInfo; import net.i2p.router.TunnelPoolSettings; import net.i2p.router.tunnel.HopConfig; import net.i2p.router.tunnel.pool.TunnelPool; +import net.i2p.router.CommSystemFacade; import net.i2p.stat.RateStat; import net.i2p.util.ObjectCounter; @@ -229,7 +230,7 @@ public class TunnelRenderer { Set peers = new HashSet(lc.objects()); peers.addAll(pc.objects()); List peerList = new ArrayList(peers); - Collections.sort(peerList, new HashComparator()); + Collections.sort(peerList, new CountryComparator(this._context.commSystem())); out.write("

      " + _("Tunnel Counts By Peer") + "

      \n"); out.write("\n"); @@ -295,6 +296,22 @@ public class TunnelRenderer { return ((Hash)l).toBase64().compareTo(((Hash)r).toBase64()); } } + + private static class CountryComparator implements Comparator { + public CountryComparator(CommSystemFacade comm) { + this.comm = comm; + } + public int compare(Hash l, Hash r) { + // get both countries + String lc = this.comm.getCountry(l); + String rc = this.comm.getCountry(r); + + // let String handle the rest + return lc.compareTo(rc); + } + + private CommSystemFacade comm; + } private String getCapacity(Hash peer) { RouterInfo info = _context.netDb().lookupRouterInfoLocally(peer); diff --git a/history.txt b/history.txt index aa9bf922b..907e71655 100644 --- a/history.txt +++ b/history.txt @@ -1,5 +1,6 @@ 2009-12-12 zzz * Disable InternalSockets until it's fixed + * Sort peers on tunnels.jsp by country 2009-12-11 zzz * Addressbook, susidns: Rework addressbook into a From 6b8dffc401d1d231a3815418833e11fa4bbc5996 Mon Sep 17 00:00:00 2001 From: dev Date: Sat, 12 Dec 2009 17:51:01 +0000 Subject: [PATCH 068/127] -4 --- router/java/src/net/i2p/router/RouterVersion.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index ef84e9e97..e4d51a2bb 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 3; + public final static long BUILD = 4; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; From 24683c19a4f2dd3db337f345b52f223f9f10ca50 Mon Sep 17 00:00:00 2001 From: russiansponsor Date: Sat, 12 Dec 2009 18:18:46 +0000 Subject: [PATCH 069/127] Added messages_ru.po with 100% fuzzy translations. Awaiting review by native. --- apps/routerconsole/locale/messages_ru.po | 4861 ++++++++++++++++++++++ 1 file changed, 4861 insertions(+) create mode 100644 apps/routerconsole/locale/messages_ru.po diff --git a/apps/routerconsole/locale/messages_ru.po b/apps/routerconsole/locale/messages_ru.po new file mode 100644 index 000000000..684fa78b9 --- /dev/null +++ b/apps/routerconsole/locale/messages_ru.po @@ -0,0 +1,4861 @@ +# I2P +# Copyright (C) 2009 The I2P Project +# This file is distributed under the same license as the routerconsole package. +# To contribute translations, see http://www.i2p2.de/newdevelopers +# foo , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: I2P routerconsole\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-12 18:10+0000\n" +"PO-Revision-Date: 2009-12-12 20:14+0300\n" +"Last-Translator: Russian Sponsor \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Russian\n" + +#: ../../../router/java/src/net/i2p/router/Blocklist.java:117 +#, fuzzy, java-format +msgid "Banned by router hash: {0}" +msgstr "Забанен маршрутизатора хэш: {0}" + +#: ../../../router/java/src/net/i2p/router/Blocklist.java:119 +#, fuzzy +msgid "Banned by router hash" +msgstr "Забанен маршрутизатора хэш" + +#: ../../../router/java/src/net/i2p/router/Blocklist.java:664 +#, fuzzy +msgid "IP banned" +msgstr "IP запрещен" + +#: ../../../router/java/src/net/i2p/router/Blocklist.java:734 +#, fuzzy, java-format +msgid "IP banned by blocklist.txt entry {0}" +msgstr "IP запрещен в blocklist.txt этой записей {0}" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:91 +#, fuzzy +msgid "Rejecting tunnels: Shutting down" +msgstr "Отвергая туннели: Выключение" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:140 +#, fuzzy +msgid "Rejecting tunnels: High message delay" +msgstr "Отвергая туннели: Высокая сообщения задержка" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:176 +#, fuzzy +msgid "Rejecting most tunnels: High number of requests" +msgstr "Отвергая большинстве туннелей: Высокое число запросов" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:232 +#, fuzzy +msgid "Rejecting tunnels: Limit reached" +msgstr "Отвергая туннелей: дошел до предела" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:300 +#, fuzzy +msgid "Rejecting tunnels: Bandwidth limit" +msgstr "Отвергая туннели: ограничить пропускную способность" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:370 +#, fuzzy +msgid "Rejecting most tunnels: Bandwidth limit" +msgstr "Отвергая наиболее туннели: ограничить пропускную способность" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:374 +#, fuzzy +msgid "Accepting most tunnels" +msgstr "Принимая большинство туннели" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:376 +#, fuzzy +msgid "Accepting tunnels" +msgstr "Принимая туннелей" + +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:486 +#, fuzzy +msgid "Rejecting tunnels" +msgstr "Отвергая туннелей" + +#: ../../../router/java/src/net/i2p/router/transport/GetBidsJob.java:70 +#, fuzzy +msgid "No transports (hidden or starting up?)" +msgstr "Нет транспорты (скрытой или начинать?)" + +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:450 +#, fuzzy +msgid "Unreachable on any transport" +msgstr "Недоступные на любом транспорте" + +#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:373 +#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:578 +#, fuzzy, java-format +msgid "Excessive clock skew: {0}" +msgstr "Чрезмерное часы не совпадающие по времени: {0}" + +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:128 +#, fuzzy +msgid "Dropping tunnel requests: Too slow" +msgstr "Удаление туннель просит: слишком медленный" + +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:340 +#, fuzzy +msgid "Dropping tunnel requests: Overloaded" +msgstr "Удаление туннель просит: Перегруженный" + +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:499 +#, fuzzy +msgid "Rejecting tunnels: Request overload" +msgstr "Отвергая туннелей: Запрос перегрузки" + +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:524 +#, fuzzy +msgid "Rejecting tunnels: Connection limit" +msgstr "Отвергая туннелей: Подключение к пределу" + +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:725 +#, fuzzy +msgid "Dropping tunnel requests: High load" +msgstr "Удаление туннель просит: Высокие нагрузки" + +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:734 +#, fuzzy +msgid "Dropping tunnel requests: Queue time" +msgstr "Удаление туннель просит: Очередь время" + +#: ../java/build/Countries.java:3 +#, fuzzy +msgid "Andorra" +msgstr "Андорра" + +#: ../java/build/Countries.java:4 +#, fuzzy +msgid "United Arab Emirates" +msgstr "Объединенные Арабские Эмираты" + +#: ../java/build/Countries.java:5 +#, fuzzy +msgid "Afghanistan" +msgstr "Афганистан" + +#: ../java/build/Countries.java:6 +#, fuzzy +msgid "Antigua and Barbuda" +msgstr "Антигуа и Барбуда" + +#: ../java/build/Countries.java:7 +#, fuzzy +msgid "Anguilla" +msgstr "Ангилья" + +#: ../java/build/Countries.java:8 +#, fuzzy +msgid "Albania" +msgstr "Албания" + +#: ../java/build/Countries.java:9 +#, fuzzy +msgid "Armenia" +msgstr "Армения" + +#: ../java/build/Countries.java:10 +#, fuzzy +msgid "Netherlands Antilles" +msgstr "Нидерландские Антильские острова" + +#: ../java/build/Countries.java:11 +#, fuzzy +msgid "Angola" +msgstr "Ангола" + +#: ../java/build/Countries.java:12 +#, fuzzy +msgid "Antarctica" +msgstr "Антарктида" + +#: ../java/build/Countries.java:13 +#, fuzzy +msgid "Argentina" +msgstr "Аргентина" + +#: ../java/build/Countries.java:14 +#, fuzzy +msgid "American Samoa" +msgstr "Американское Самоа" + +#: ../java/build/Countries.java:15 +#, fuzzy +msgid "Austria" +msgstr "Австрия" + +#: ../java/build/Countries.java:16 +#, fuzzy +msgid "Australia" +msgstr "Австралия" + +#: ../java/build/Countries.java:17 +#, fuzzy +msgid "Aruba" +msgstr "Аруба" + +#: ../java/build/Countries.java:19 +#, fuzzy +msgid "Azerbaijan" +msgstr "Азербайджан" + +#: ../java/build/Countries.java:20 +#, fuzzy +msgid "Bosnia and Herzegovina" +msgstr "Босния и Герцеговина" + +#: ../java/build/Countries.java:21 +#, fuzzy +msgid "Barbados" +msgstr "Барбадос" + +#: ../java/build/Countries.java:22 +#, fuzzy +msgid "Bangladesh" +msgstr "Бангладеш" + +#: ../java/build/Countries.java:23 +#, fuzzy +msgid "Belgium" +msgstr "Бельгия" + +#: ../java/build/Countries.java:24 +#, fuzzy +msgid "Burkina Faso" +msgstr "Буркина-Фасо" + +#: ../java/build/Countries.java:25 +#, fuzzy +msgid "Bulgaria" +msgstr "Болгария" + +#: ../java/build/Countries.java:26 +#, fuzzy +msgid "Bahrain" +msgstr "Бахрейн" + +#: ../java/build/Countries.java:27 +#, fuzzy +msgid "Burundi" +msgstr "Бурунди" + +#: ../java/build/Countries.java:28 +#, fuzzy +msgid "Benin" +msgstr "Бенин" + +#: ../java/build/Countries.java:29 +#, fuzzy +msgid "Bermuda" +msgstr "Бермудские Острова" + +#: ../java/build/Countries.java:30 +#, fuzzy +msgid "Brunei Darussalam" +msgstr "Бруней-Даруссалам" + +#: ../java/build/Countries.java:31 +#, fuzzy +msgid "Bolivia" +msgstr "Боливия" + +#: ../java/build/Countries.java:32 +#, fuzzy +msgid "Brazil" +msgstr "Бразилия" + +#: ../java/build/Countries.java:33 +#, fuzzy +msgid "Bahamas" +msgstr "Багамские острова" + +#: ../java/build/Countries.java:34 +#, fuzzy +msgid "Bhutan" +msgstr "Бутан" + +#: ../java/build/Countries.java:35 +#, fuzzy +msgid "Bouvet Island" +msgstr "Остров Буве" + +#: ../java/build/Countries.java:36 +#, fuzzy +msgid "Botswana" +msgstr "Ботсвана" + +#: ../java/build/Countries.java:37 +#, fuzzy +msgid "Belarus" +msgstr "Беларусь" + +#: ../java/build/Countries.java:38 +#, fuzzy +msgid "Belize" +msgstr "Белиз" + +#: ../java/build/Countries.java:39 +#, fuzzy +msgid "Canada" +msgstr "Канада" + +#: ../java/build/Countries.java:40 +#, fuzzy +msgid "The Democratic Republic of the Congo" +msgstr "Демократическая Республика Конго" + +#: ../java/build/Countries.java:41 +#, fuzzy +msgid "Central African Republic" +msgstr "Центральноафриканская Республика" + +#: ../java/build/Countries.java:42 +#, fuzzy +msgid "Congo" +msgstr "Конго" + +#: ../java/build/Countries.java:43 +#, fuzzy +msgid "Switzerland" +msgstr "Швейцария" + +#: ../java/build/Countries.java:44 +#, fuzzy +msgid "Cote D'Ivoire" +msgstr "Кот-д'Ивуар" + +#: ../java/build/Countries.java:45 +#, fuzzy +msgid "Cook Islands" +msgstr "Острова Кука" + +#: ../java/build/Countries.java:46 +#, fuzzy +msgid "Chile" +msgstr "Чили" + +#: ../java/build/Countries.java:47 +#, fuzzy +msgid "Cameroon" +msgstr "Камерун" + +#: ../java/build/Countries.java:48 +#, fuzzy +msgid "China" +msgstr "Китай" + +#: ../java/build/Countries.java:49 +#, fuzzy +msgid "Colombia" +msgstr "Колумбия" + +#: ../java/build/Countries.java:50 +#, fuzzy +msgid "Costa Rica" +msgstr "Коста-Рика" + +#: ../java/build/Countries.java:51 +#, fuzzy +msgid "Serbia and Montenegro" +msgstr "Сербия и Черногория" + +#: ../java/build/Countries.java:52 +#, fuzzy +msgid "Cuba" +msgstr "Куба" + +#: ../java/build/Countries.java:53 +#, fuzzy +msgid "Cape Verde" +msgstr "Кабо-Верде" + +#: ../java/build/Countries.java:54 +#, fuzzy +msgid "Cyprus" +msgstr "Кипр" + +#: ../java/build/Countries.java:55 +#, fuzzy +msgid "Czech Republic" +msgstr "Чехия" + +#: ../java/build/Countries.java:56 +#, fuzzy +msgid "Germany" +msgstr "Германия" + +#: ../java/build/Countries.java:57 +#, fuzzy +msgid "Djibouti" +msgstr "Джибути" + +#: ../java/build/Countries.java:58 +#, fuzzy +msgid "Denmark" +msgstr "Дания" + +#: ../java/build/Countries.java:59 +#, fuzzy +msgid "Dominica" +msgstr "Доминика" + +#: ../java/build/Countries.java:60 +#, fuzzy +msgid "Dominican Republic" +msgstr "Доминиканская Республика" + +#: ../java/build/Countries.java:61 +#, fuzzy +msgid "Algeria" +msgstr "Алжир" + +#: ../java/build/Countries.java:62 +#, fuzzy +msgid "Ecuador" +msgstr "Эквадор" + +#: ../java/build/Countries.java:63 +#, fuzzy +msgid "Estonia" +msgstr "Эстония" + +#: ../java/build/Countries.java:64 +#, fuzzy +msgid "Egypt" +msgstr "Египет" + +#: ../java/build/Countries.java:65 +#, fuzzy +msgid "Eritrea" +msgstr "Эритрея" + +#: ../java/build/Countries.java:66 +#, fuzzy +msgid "Spain" +msgstr "Испания" + +#: ../java/build/Countries.java:67 +#, fuzzy +msgid "Ethiopia" +msgstr "Эфиопия" + +#: ../java/build/Countries.java:68 +#, fuzzy +msgid "Finland" +msgstr "Финляндия" + +#: ../java/build/Countries.java:69 +#, fuzzy +msgid "Fiji" +msgstr "Фиджи" + +#: ../java/build/Countries.java:70 +#, fuzzy +msgid "Falkland Islands (Malvinas)" +msgstr "Фолклендские (Мальвинские)" + +#: ../java/build/Countries.java:71 +#, fuzzy +msgid "Federated States of Micronesia" +msgstr "Федеративные Штаты Микронезии" + +#: ../java/build/Countries.java:72 +#, fuzzy +msgid "Faroe Islands" +msgstr "Фарерские острова" + +#: ../java/build/Countries.java:73 +#, fuzzy +msgid "France" +msgstr "Франция" + +#: ../java/build/Countries.java:74 +#, fuzzy +msgid "Gabon" +msgstr "Габон" + +#: ../java/build/Countries.java:75 +#, fuzzy +msgid "United Kingdom" +msgstr "Великобритания" + +#: ../java/build/Countries.java:76 +#, fuzzy +msgid "Grenada" +msgstr "Гренада" + +#: ../java/build/Countries.java:77 +#, fuzzy +msgid "Georgia" +msgstr "Грузия" + +#: ../java/build/Countries.java:78 +#, fuzzy +msgid "French Guiana" +msgstr "Французская Гвиана" + +#: ../java/build/Countries.java:79 +#, fuzzy +msgid "Ghana" +msgstr "Гана" + +#: ../java/build/Countries.java:80 +#, fuzzy +msgid "Gibraltar" +msgstr "Гибралтар" + +#: ../java/build/Countries.java:81 +#, fuzzy +msgid "Greenland" +msgstr "Гренландия" + +#: ../java/build/Countries.java:82 +#, fuzzy +msgid "Gambia" +msgstr "Гамбия" + +#: ../java/build/Countries.java:83 +#, fuzzy +msgid "Guinea" +msgstr "Гвинея" + +#: ../java/build/Countries.java:84 +#, fuzzy +msgid "Guadeloupe" +msgstr "Гваделупа" + +#: ../java/build/Countries.java:85 +#, fuzzy +msgid "Equatorial Guinea" +msgstr "Экваториальная Гвинея" + +#: ../java/build/Countries.java:86 +#, fuzzy +msgid "Greece" +msgstr "Греция" + +#: ../java/build/Countries.java:87 +#, fuzzy +msgid "South Georgia and the South Sandwich Islands" +msgstr "Южная Джорджия и Южные Сандвичевы Острова" + +#: ../java/build/Countries.java:88 +#, fuzzy +msgid "Guatemala" +msgstr "Гватемала" + +#: ../java/build/Countries.java:89 +#, fuzzy +msgid "Guam" +msgstr "Гуам" + +#: ../java/build/Countries.java:90 +#, fuzzy +msgid "Guinea-Bissau" +msgstr "Гвинея-Бисау" + +#: ../java/build/Countries.java:91 +#, fuzzy +msgid "Guyana" +msgstr "Гайана" + +#: ../java/build/Countries.java:92 +#, fuzzy +msgid "Hong Kong" +msgstr "Гонконг" + +#: ../java/build/Countries.java:93 +#, fuzzy +msgid "Honduras" +msgstr "Гондурас" + +#: ../java/build/Countries.java:94 +#, fuzzy +msgid "Croatia" +msgstr "Хорватия" + +#: ../java/build/Countries.java:95 +#, fuzzy +msgid "Haiti" +msgstr "Гаити" + +#: ../java/build/Countries.java:96 +#, fuzzy +msgid "Hungary" +msgstr "Венгрия" + +#: ../java/build/Countries.java:97 +#, fuzzy +msgid "Indonesia" +msgstr "Индонезия" + +#: ../java/build/Countries.java:98 +#, fuzzy +msgid "Ireland" +msgstr "Ирландия" + +#: ../java/build/Countries.java:99 +#, fuzzy +msgid "Israel" +msgstr "Израиль" + +#: ../java/build/Countries.java:101 +#, fuzzy +msgid "India" +msgstr "Индия" + +#: ../java/build/Countries.java:102 +#, fuzzy +msgid "British Indian Ocean Territory" +msgstr "Британская территория в Индийском океане" + +#: ../java/build/Countries.java:103 +#, fuzzy +msgid "Iraq" +msgstr "Ирак" + +#: ../java/build/Countries.java:104 +#, fuzzy +msgid "Islamic Republic of Iran" +msgstr "Исламская Республика Иран" + +#: ../java/build/Countries.java:105 +#, fuzzy +msgid "Iceland" +msgstr "Исландия" + +#: ../java/build/Countries.java:106 +#, fuzzy +msgid "Italy" +msgstr "Италия" + +#: ../java/build/Countries.java:108 +#, fuzzy +msgid "Jamaica" +msgstr "Ямайка" + +#: ../java/build/Countries.java:109 +#, fuzzy +msgid "Jordan" +msgstr "Иордания" + +#: ../java/build/Countries.java:110 +#, fuzzy +msgid "Japan" +msgstr "Япония" + +#: ../java/build/Countries.java:111 +#, fuzzy +msgid "Kenya" +msgstr "Кения" + +#: ../java/build/Countries.java:112 +#, fuzzy +msgid "Kyrgyzstan" +msgstr "Кыргызстан" + +#: ../java/build/Countries.java:113 +#, fuzzy +msgid "Cambodia" +msgstr "Камбоджа" + +#: ../java/build/Countries.java:114 +#, fuzzy +msgid "Kiribati" +msgstr "Кирибати" + +#: ../java/build/Countries.java:115 +#, fuzzy +msgid "Comoros" +msgstr "Коморские Острова" + +#: ../java/build/Countries.java:116 +#, fuzzy +msgid "Saint Kitts and Nevis" +msgstr "Сент-Китс и Невис" + +#: ../java/build/Countries.java:117 +#, fuzzy +msgid "Republic of Korea" +msgstr "Республика Корея" + +#: ../java/build/Countries.java:118 +#, fuzzy +msgid "Kuwait" +msgstr "Кувейт" + +#: ../java/build/Countries.java:119 +#, fuzzy +msgid "Cayman Islands" +msgstr "Каймановы острова" + +#: ../java/build/Countries.java:120 +#, fuzzy +msgid "Kazakhstan" +msgstr "Казахстан" + +#: ../java/build/Countries.java:121 +#, fuzzy +msgid "Lao People's Democratic Republic" +msgstr "Лаосская Народно-Демократическая Республика" + +#: ../java/build/Countries.java:122 +#, fuzzy +msgid "Lebanon" +msgstr "Ливан" + +#: ../java/build/Countries.java:123 +#, fuzzy +msgid "Saint Lucia" +msgstr "Сент-Люсия" + +#: ../java/build/Countries.java:124 +#, fuzzy +msgid "Liechtenstein" +msgstr "Лихтенштейн" + +#: ../java/build/Countries.java:125 +#, fuzzy +msgid "Sri Lanka" +msgstr "Шри-Ланка" + +#: ../java/build/Countries.java:126 +#, fuzzy +msgid "Liberia" +msgstr "Либерия" + +#: ../java/build/Countries.java:127 +#, fuzzy +msgid "Lesotho" +msgstr "Лесото" + +#: ../java/build/Countries.java:128 +#, fuzzy +msgid "Lithuania" +msgstr "Литва" + +#: ../java/build/Countries.java:129 +#, fuzzy +msgid "Luxembourg" +msgstr "Люксембург" + +#: ../java/build/Countries.java:130 +#, fuzzy +msgid "Latvia" +msgstr "Латвия" + +#: ../java/build/Countries.java:131 +#, fuzzy +msgid "Libyan Arab Jamahiriya" +msgstr "Ливийская Арабская Джамахирия" + +#: ../java/build/Countries.java:132 +#, fuzzy +msgid "Morocco" +msgstr "Марокко" + +#: ../java/build/Countries.java:133 +#, fuzzy +msgid "Monaco" +msgstr "Монако" + +#: ../java/build/Countries.java:134 +#, fuzzy +msgid "Republic of Moldova" +msgstr "Республика Молдова" + +#: ../java/build/Countries.java:137 +#, fuzzy +msgid "Madagascar" +msgstr "Мадагаскар" + +#: ../java/build/Countries.java:138 +#, fuzzy +msgid "Marshall Islands" +msgstr "Маршалловы Острова" + +#: ../java/build/Countries.java:139 +#, fuzzy +msgid "The Former Yugoslav Republic of Macedonia" +msgstr "Бывшая югославская Республика Македония" + +#: ../java/build/Countries.java:140 +#, fuzzy +msgid "Mali" +msgstr "Мали" + +#: ../java/build/Countries.java:141 +#, fuzzy +msgid "Myanmar" +msgstr "Мьянма" + +#: ../java/build/Countries.java:142 +#, fuzzy +msgid "Mongolia" +msgstr "Монголия" + +#: ../java/build/Countries.java:143 +#, fuzzy +msgid "Macao" +msgstr "Макао" + +#: ../java/build/Countries.java:144 +#, fuzzy +msgid "Northern Mariana Islands" +msgstr "Северные Марианские о-ва" + +#: ../java/build/Countries.java:145 +#, fuzzy +msgid "Martinique" +msgstr "Мартиника" + +#: ../java/build/Countries.java:146 +#, fuzzy +msgid "Mauritania" +msgstr "Мавритания" + +#: ../java/build/Countries.java:147 +#, fuzzy +msgid "Montserrat" +msgstr "Монтсеррат" + +#: ../java/build/Countries.java:148 +#, fuzzy +msgid "Malta" +msgstr "Мальта" + +#: ../java/build/Countries.java:149 +#, fuzzy +msgid "Mauritius" +msgstr "Маврикий" + +#: ../java/build/Countries.java:150 +#, fuzzy +msgid "Maldives" +msgstr "Мальдивы" + +#: ../java/build/Countries.java:151 +#, fuzzy +msgid "Malawi" +msgstr "Малави" + +#: ../java/build/Countries.java:152 +#, fuzzy +msgid "Mexico" +msgstr "Мексика" + +#: ../java/build/Countries.java:153 +#, fuzzy +msgid "Malaysia" +msgstr "Малайзия" + +#: ../java/build/Countries.java:154 +#, fuzzy +msgid "Mozambique" +msgstr "Мозамбик" + +#: ../java/build/Countries.java:155 +#, fuzzy +msgid "Namibia" +msgstr "Мозамбик" + +#: ../java/build/Countries.java:156 +#, fuzzy +msgid "New Caledonia" +msgstr "Новая Каледония" + +#: ../java/build/Countries.java:157 +#, fuzzy +msgid "Niger" +msgstr "Нигер" + +#: ../java/build/Countries.java:158 +#, fuzzy +msgid "Norfolk Island" +msgstr "Остров Норфолк" + +#: ../java/build/Countries.java:159 +#, fuzzy +msgid "Nigeria" +msgstr "Нигерия" + +#: ../java/build/Countries.java:160 +#, fuzzy +msgid "Nicaragua" +msgstr "Никарагуа" + +#: ../java/build/Countries.java:161 +#, fuzzy +msgid "Netherlands" +msgstr "Нидерланды" + +#: ../java/build/Countries.java:162 +#, fuzzy +msgid "Norway" +msgstr "Норвегия" + +#: ../java/build/Countries.java:163 +#, fuzzy +msgid "Nepal" +msgstr "Непал" + +#: ../java/build/Countries.java:164 +#, fuzzy +msgid "Nauru" +msgstr "Науру" + +#: ../java/build/Countries.java:165 +#, fuzzy +msgid "Niue" +msgstr "Ниуэ" + +#: ../java/build/Countries.java:166 +#, fuzzy +msgid "New Zealand" +msgstr "Новая Зеландия" + +#: ../java/build/Countries.java:167 +#, fuzzy +msgid "Oman" +msgstr "Оман" + +#: ../java/build/Countries.java:168 +#, fuzzy +msgid "Panama" +msgstr "Панама" + +#: ../java/build/Countries.java:169 +#, fuzzy +msgid "Peru" +msgstr "Перу" + +#: ../java/build/Countries.java:170 +#, fuzzy +msgid "French Polynesia" +msgstr "Французская Полинезия" + +#: ../java/build/Countries.java:171 +#, fuzzy +msgid "Papua New Guinea" +msgstr "Папуа-Новая Гвинея" + +#: ../java/build/Countries.java:172 +#, fuzzy +msgid "Philippines" +msgstr "Филиппины" + +#: ../java/build/Countries.java:173 +#, fuzzy +msgid "Pakistan" +msgstr "Пакистан" + +#: ../java/build/Countries.java:174 +#, fuzzy +msgid "Poland" +msgstr "Польша" + +#: ../java/build/Countries.java:175 +#, fuzzy +msgid "Saint Pierre and Miquelon" +msgstr "Сен-Пьер и Микелон" + +#: ../java/build/Countries.java:176 +#, fuzzy +msgid "Puerto Rico" +msgstr "Пуэрто-Рико" + +#: ../java/build/Countries.java:177 +#, fuzzy +msgid "Palestinian Territory" +msgstr "Палестинская автономия" + +#: ../java/build/Countries.java:178 +#, fuzzy +msgid "Portugal" +msgstr "Португалия" + +#: ../java/build/Countries.java:179 +#, fuzzy +msgid "Palau" +msgstr "Палау" + +#: ../java/build/Countries.java:180 +#, fuzzy +msgid "Paraguay" +msgstr "Парагвай" + +#: ../java/build/Countries.java:181 +#, fuzzy +msgid "Qatar" +msgstr "Катар" + +#: ../java/build/Countries.java:182 +#, fuzzy +msgid "Reunion" +msgstr "Реюньон" + +#: ../java/build/Countries.java:183 +#, fuzzy +msgid "Romania" +msgstr "Румыния" + +#: ../java/build/Countries.java:184 +#, fuzzy +msgid "Serbia" +msgstr "Сербия" + +#: ../java/build/Countries.java:185 +#, fuzzy +msgid "Russian Federation" +msgstr "Русская Федерация" + +#: ../java/build/Countries.java:186 +#, fuzzy +msgid "Rwanda" +msgstr "Руанда" + +#: ../java/build/Countries.java:187 +#, fuzzy +msgid "Saudi Arabia" +msgstr "Саудовская Аравия" + +#: ../java/build/Countries.java:188 +#, fuzzy +msgid "Solomon Islands" +msgstr "Соломоновы Острова" + +#: ../java/build/Countries.java:189 +#, fuzzy +msgid "Seychelles" +msgstr "Сейшельские Острова" + +#: ../java/build/Countries.java:190 +#, fuzzy +msgid "Sudan" +msgstr "Судан" + +#: ../java/build/Countries.java:191 +#, fuzzy +msgid "Sweden" +msgstr "Швеция" + +#: ../java/build/Countries.java:192 +#, fuzzy +msgid "Singapore" +msgstr "Сингапур" + +#: ../java/build/Countries.java:193 +#, fuzzy +msgid "Slovenia" +msgstr "Словения" + +#: ../java/build/Countries.java:194 +#, fuzzy +msgid "Slovakia" +msgstr "Словакия" + +#: ../java/build/Countries.java:195 +#, fuzzy +msgid "Sierra Leone" +msgstr "Сьерра-Леоне" + +#: ../java/build/Countries.java:196 +#, fuzzy +msgid "San Marino" +msgstr "Сан - Марине" + +#: ../java/build/Countries.java:197 +#, fuzzy +msgid "Senegal" +msgstr "Сенегал" + +#: ../java/build/Countries.java:198 +#, fuzzy +msgid "Somalia" +msgstr "Сомали" + +#: ../java/build/Countries.java:199 +#, fuzzy +msgid "Suriname" +msgstr "Суринам" + +#: ../java/build/Countries.java:200 +#, fuzzy +msgid "Sao Tome and Principe" +msgstr "Сан-Томе и Принсипи" + +#: ../java/build/Countries.java:201 +#, fuzzy +msgid "El Salvador" +msgstr "Сальвадор" + +#: ../java/build/Countries.java:202 +#, fuzzy +msgid "Syrian Arab Republic" +msgstr "Сирийская Арабская Республика" + +#: ../java/build/Countries.java:203 +#, fuzzy +msgid "Swaziland" +msgstr "Свазиленд" + +#: ../java/build/Countries.java:204 +#, fuzzy +msgid "Turks and Caicos Islands" +msgstr "Острова Теркс и Кайкос" + +#: ../java/build/Countries.java:205 +#, fuzzy +msgid "Chad" +msgstr "Чад" + +#: ../java/build/Countries.java:206 +#, fuzzy +msgid "French Southern Territories" +msgstr "Французские Южные Территории" + +#: ../java/build/Countries.java:207 +#, fuzzy +msgid "Togo" +msgstr "Того" + +#: ../java/build/Countries.java:208 +#, fuzzy +msgid "Thailand" +msgstr "Таиланд" + +#: ../java/build/Countries.java:209 +#, fuzzy +msgid "Tajikistan" +msgstr "Таджикистан" + +#: ../java/build/Countries.java:210 +#, fuzzy +msgid "Tokelau" +msgstr "Токелау" + +#: ../java/build/Countries.java:211 +#, fuzzy +msgid "Timor-Leste" +msgstr "Восточный Тимор" + +#: ../java/build/Countries.java:212 +#, fuzzy +msgid "Turkmenistan" +msgstr "Туркменистан" + +#: ../java/build/Countries.java:213 +#, fuzzy +msgid "Tunisia" +msgstr "Тунис" + +#: ../java/build/Countries.java:214 +#, fuzzy +msgid "Tonga" +msgstr "Тонга" + +#: ../java/build/Countries.java:215 +#, fuzzy +msgid "Turkey" +msgstr "Турция" + +#: ../java/build/Countries.java:216 +#, fuzzy +msgid "Trinidad and Tobago" +msgstr "Тринидад и Тобаго" + +#: ../java/build/Countries.java:217 +#, fuzzy +msgid "Tuvalu" +msgstr "Тувалу" + +#: ../java/build/Countries.java:218 +#, fuzzy +msgid "Taiwan" +msgstr "Тайвань" + +#: ../java/build/Countries.java:219 +#, fuzzy +msgid "United Republic of Tanzania" +msgstr "Объединенная Республика Танзания" + +#: ../java/build/Countries.java:220 +#, fuzzy +msgid "Ukraine" +msgstr "Украина" + +#: ../java/build/Countries.java:221 +#, fuzzy +msgid "Uganda" +msgstr "Уганда" + +#: ../java/build/Countries.java:222 +#, fuzzy +msgid "United States Minor Outlying Islands" +msgstr "Внешние малые острова (США)" + +#: ../java/build/Countries.java:223 +#, fuzzy +msgid "United States" +msgstr "Соединенные Штаты Америки" + +#: ../java/build/Countries.java:224 +#, fuzzy +msgid "Uruguay" +msgstr "Уругвай" + +#: ../java/build/Countries.java:225 +#, fuzzy +msgid "Uzbekistan" +msgstr "Узбекистан" + +#: ../java/build/Countries.java:226 +#, fuzzy +msgid "Holy See (Vatican City State)" +msgstr "Святой Престол (Ватикан)" + +#: ../java/build/Countries.java:227 +#, fuzzy +msgid "Saint Vincent and the Grenadines" +msgstr "Сент-Винсент и Гренадины" + +#: ../java/build/Countries.java:228 +#, fuzzy +msgid "Venezuela" +msgstr "Венесуэла" + +#: ../java/build/Countries.java:229 +#: ../java/build/Countries.java:230 +#, fuzzy +msgid "Virgin Islands" +msgstr "Виргинские острова" + +#: ../java/build/Countries.java:231 +#, fuzzy +msgid "Viet Nam" +msgstr "Вьетнам" + +#: ../java/build/Countries.java:232 +#, fuzzy +msgid "Vanuatu" +msgstr "Вануату" + +#: ../java/build/Countries.java:233 +#, fuzzy +msgid "Wallis and Futuna" +msgstr "Уоллис и Футуна" + +#: ../java/build/Countries.java:234 +#, fuzzy +msgid "Samoa" +msgstr "Самоа" + +#: ../java/build/Countries.java:235 +#, fuzzy +msgid "Yemen" +msgstr "Йемен" + +#: ../java/build/Countries.java:236 +#, fuzzy +msgid "Mayotte" +msgstr "Майотта" + +#: ../java/build/Countries.java:237 +#, fuzzy +msgid "South Africa" +msgstr "Южная Африка" + +#: ../java/build/Countries.java:238 +#, fuzzy +msgid "Zambia" +msgstr "Замбия" + +#: ../java/build/Countries.java:239 +#, fuzzy +msgid "Zimbabwe" +msgstr "Зимбабве" + +#: ../java/src/net/i2p/router/web/CSSHelper.java:41 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:30 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:32 +#: ../java/strings/Strings.java:29 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/index_jsp.java:234 +#, fuzzy +msgid "I2P Router Console" +msgstr "Консоль Маршрутизатора I2P" + +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:57 +#, fuzzy +msgid "Error updating the configuration - please see the error logs" +msgstr "Ошибка при обновлении конфигурации - смотрите логи ошибок" + +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:69 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:251 +#, fuzzy +msgid "Configuration saved successfully" +msgstr "Конфигурация успешно сохранены" + +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:253 +#, fuzzy +msgid "Error saving the configuration (applied but not saved) - please see the error logs" +msgstr "Ошибка при сохранении конфигурации (применяется, но не сохранили) - пожалуйста, смотрите логи ошибок" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:32 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:321 +#, fuzzy +msgid "Save Client Configuration" +msgstr "Сохраните Настройки Клиента" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:36 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:333 +#, fuzzy +msgid "Save WebApp Configuration" +msgstr "Сохранять WebApp Конфигурацию" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:54 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:67 +#, fuzzy +msgid "Start" +msgstr "Включать" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:68 +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:49 +#, fuzzy +msgid "Unsupported" +msgstr "Неподдерживаемый" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:83 +#, fuzzy +msgid "Client configuration saved successfully - restart required to take effect." +msgstr "Настройка клиента успешно сохранены - Требуется перезагрузка вступили в силу." + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:89 +#, fuzzy +msgid "Bad client index." +msgstr "Индекс плохой клиент." + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:94 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:17 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:363 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:371 +#, fuzzy +msgid "Client" +msgstr "Клиент" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:94 +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:129 +#, fuzzy +msgid "started" +msgstr "началось" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:111 +#, fuzzy +msgid "WebApp configuration saved successfully - restart required to take effect." +msgstr "Конфигурация веб-приложений успешно сохранены - Требуется перезагрузка вступили в силу." + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:129 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:34 +#, fuzzy +msgid "WebApp" +msgstr "Веб-приложение" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:131 +#, fuzzy +msgid "Failed to start" +msgstr "Сбой при запуске" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:137 +#, fuzzy +msgid "Failed to find server." +msgstr "Не удалось найти сервер." + +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:17 +#, fuzzy +msgid "Class and arguments" +msgstr "Класс и параметры" + +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:17 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:34 +#, fuzzy +msgid "Run at Startup?" +msgstr "Запустить при следующем запуске системы?" + +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:17 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:34 +#, fuzzy +msgid "Start Now" +msgstr "Запустить Cейчас" + +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:34 +#, fuzzy +msgid "Description" +msgstr "Описание" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:18 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:320 +#, fuzzy +msgid "Add key" +msgstr "Добавить ключ" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:19 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:322 +#, fuzzy +msgid "Delete key" +msgstr "Удалить ключ" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:21 +#, fuzzy +msgid "You must enter a destination" +msgstr "Вы должны ввести назначения" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:23 +#, fuzzy +msgid "You must enter a key" +msgstr "Вы должны ввести ключевые" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:34 +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:41 +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:43 +#, fuzzy +msgid "Key for" +msgstr "Ключ для" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:34 +#, fuzzy +msgid "added to keyring" +msgstr "добавить в связку ключей" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:36 +#, fuzzy +msgid "Invalid destination or key" +msgstr "Invalid destination or key" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:41 +#, fuzzy +msgid "removed from keyring" +msgstr "удалены из связку ключей" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:43 +#, fuzzy +msgid "not found in keyring" +msgstr "Не найдено в связку ключей" + +#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:45 +#, fuzzy +msgid "Invalid destination" +msgstr "Invalid destination" + +#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52 +#, fuzzy +msgid "CRIT" +msgstr "КРИТИЧЕСКИЕ" + +#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52 +#, fuzzy +msgid "DEBUG" +msgstr "ОТЛАДКА" + +#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52 +#, fuzzy +msgid "ERROR" +msgstr "ОШИБКА" + +#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52 +#, fuzzy +msgid "INFO" +msgstr "ИНФОРМАЦИЯ" + +#: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:52 +#, fuzzy +msgid "WARN" +msgstr "ПРЕДУПРЕЖДЕНИЕ" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18 +#, fuzzy +msgid "Network" +msgstr "Сеть" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18 +#, fuzzy +msgid "Service" +msgstr "Сервис" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:86 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:253 +#, fuzzy +msgid "Tunnels" +msgstr "Туннели" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18 +#, fuzzy +msgid "UI" +msgstr "Интерфейс Пользователя" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:18 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:202 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#, fuzzy +msgid "Update" +msgstr "Обновление" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 +#, fuzzy +msgid "Clients" +msgstr "Клиенты" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:292 +#, fuzzy +msgid "Keyring" +msgstr "Cвязку Kлючей" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 +#, fuzzy +msgid "Logging" +msgstr "Логи" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:92 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 +#, fuzzy +msgid "Peers" +msgstr "Пиры" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:293 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:128 +#, fuzzy +msgid "Stats" +msgstr "Статистика" + +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20 +#, fuzzy +msgid "Advanced" +msgstr "Расширенный" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:47 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:35 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:357 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:494 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:333 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:373 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:341 +#, fuzzy +msgid "Save changes" +msgstr "Сохранить изменения" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:119 +#, fuzzy +msgid "Rechecking router reachability..." +msgstr "Повторная проверка доступности маршрутизатора..." + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:148 +#, fuzzy +msgid "Updating IP address" +msgstr "Обновление IP-адреса" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:166 +#, fuzzy +msgid "Disabling TCP completely" +msgstr "Отключение TCP полностью" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:170 +#, fuzzy +msgid "Updating inbound TCP address to" +msgstr "Обновление входящего в адрес TCP" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:174 +#, fuzzy +msgid "Disabling inbound TCP" +msgstr "Отключение входящие TCP" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:176 +#, fuzzy +msgid "Updating inbound TCP address to auto" +msgstr "Обновление входящего адреса TCP автоматически" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:185 +#, fuzzy +msgid "Updating inbound TCP port to" +msgstr "Обновление входящего порта TCP для" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:188 +#, fuzzy +msgid "Updating inbound TCP port to auto" +msgstr "Обновление входящего порта TCP автоматически" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:200 +#, fuzzy +msgid "Updating UDP port from" +msgstr "Обновление от UDP порта" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:200 +#, fuzzy +msgid "to" +msgstr "к" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:216 +#, fuzzy +msgid "Gracefully restarting into Hidden Router Mode" +msgstr "Правильно перезапуска в скрытые режиме маршрутизатора" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:218 +#, fuzzy +msgid "Gracefully restarting to exit Hidden Router Mode" +msgstr "Правильно перезапуска для выхода Скрытый режим маршрутизатора" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:227 +#, fuzzy +msgid "Enabling UPnP, restart required to take effect" +msgstr "Включение UPnP, необходима перезагрузка вступили в силу" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:229 +#, fuzzy +msgid "Disabling UPnP, restart required to take effect" +msgstr "Отключение UPnP, необходима перезагрузка вступили в силу" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:235 +#, fuzzy +msgid "Requiring SSU introducers" +msgstr "Требование SSU поручителями" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:275 +#, fuzzy +msgid "Gracefully restarting I2P to change published router address" +msgstr "Правильно перезапуска I2P изменить опубликован адрес маршрутизатора" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:293 +#, fuzzy +msgid "Updating bandwidth share percentage" +msgstr "Обновление пропускную процентной доли" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:363 +#, fuzzy +msgid "Updated bandwidth limits" +msgstr "Обновлен пределы полосы пропускания" + +#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:39 +#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:47 +#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:50 +#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:57 +#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:60 +#, fuzzy +msgid "unknown" +msgstr "неизвестный" + +#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:165 +#, fuzzy +msgid "bits per second" +msgstr "бит в секунду" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:20 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:314 +#, fuzzy +msgid "Ban peer until restart" +msgstr "Запрет пир пока маршрутизатора перезагружается" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:23 +#, fuzzy, java-format +msgid "Manually banned via {0}" +msgstr "Вручную запретили через {0}" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:24 +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:33 +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:35 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:187 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:235 +#, fuzzy +msgid "Peer" +msgstr "Пир" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:24 +#, fuzzy +msgid "banned until restart" +msgstr "Запрещена пока перезагрузка" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:27 +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:38 +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:59 +#, fuzzy +msgid "Invalid peer" +msgstr "Неверное сверстников" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:28 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:316 +#, fuzzy +msgid "Unban peer" +msgstr "Отмена запрета пира" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:33 +#, fuzzy +msgid "unbanned" +msgstr "запрет удален" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:35 +#, fuzzy +msgid "is not currently banned" +msgstr "в настоящее время не запрещена" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:39 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:322 +#, fuzzy +msgid "Adjust Profile Bonuses" +msgstr "Настройка дополнительных потоков профиля" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:47 +#, fuzzy +msgid "Bad speed value" +msgstr "Неправильное значение скорости" + +#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:52 +#, fuzzy +msgid "Bad capacity value" +msgstr "Неправильное значение потенциала" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:32 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:57 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:292 +#, fuzzy +msgid "Shutdown immediately" +msgstr "Выключить сразу" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:36 +#, fuzzy +msgid "Cancel shutdown" +msgstr "Отмена выключения" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:37 +#, fuzzy +msgid "Cancel restart" +msgstr "Отмена перезагрузка" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:39 +#, fuzzy +msgid "Restart immediately" +msgstr "Перезагрузка сразу" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:43 +#, fuzzy +msgid "Restart" +msgstr "Перезагрузка" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:46 +#, fuzzy +msgid "Shutdown" +msgstr "Выключение" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:59 +#, fuzzy +msgid "Restart imminent" +msgstr "Перезагрузка сразу" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:61 +#, fuzzy +msgid "Shutdown imminent" +msgstr "Выключения неминуемого" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:65 +#, fuzzy, java-format +msgid "Shutdown in {0}" +msgstr "Выключение через {0}" + +#: ../java/src/net/i2p/router/web/ConfigRestartBean.java:70 +#, fuzzy, java-format +msgid "Restart in {0}" +msgstr "Перезагрузка через {0}" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:53 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:290 +#, fuzzy +msgid "Shutdown gracefully" +msgstr "Грациозно выключить" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:56 +#, fuzzy +msgid "Graceful shutdown initiated" +msgstr "Изящный выключение инициативе" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:60 +#, fuzzy +msgid "Shutdown immediately! boom bye bye bad bwoy" +msgstr "выключения немедленно! бум пока пока плохой мальчик" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:61 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:294 +#, fuzzy +msgid "Cancel graceful shutdown" +msgstr "Отмена изящные выключении" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:63 +#, fuzzy +msgid "Graceful shutdown cancelled" +msgstr "Изящный выключения отменен" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:64 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:308 +#, fuzzy +msgid "Graceful restart" +msgstr "Мягкого перезапуска" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:67 +#, fuzzy +msgid "Graceful restart requested" +msgstr "Мягкого перезапуска просил" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:68 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:310 +#, fuzzy +msgid "Hard restart" +msgstr "Жесткая перезагрузка" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:71 +#, fuzzy +msgid "Hard restart requested" +msgstr "Жесткая перезагрузка просил" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:72 +#, fuzzy +msgid "Rekey and Restart" +msgstr "Восстановить Ключ и Перезагрузите" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:73 +#, fuzzy +msgid "Rekeying after graceful restart" +msgstr "Повторный ввод после мягкого перезапуска" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:76 +#, fuzzy +msgid "Rekey and Shutdown" +msgstr "Восстановить Ключ и Выключении" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:77 +#, fuzzy +msgid "Rekeying after graceful shutdown" +msgstr "Повторный ввод после выключения изящный" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:80 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:338 +#, fuzzy +msgid "Run I2P on startup" +msgstr "Запуск I2P при запуске" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:82 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:340 +#, fuzzy +msgid "Don't run I2P on startup" +msgstr "Не запускать при запуске I2P" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:84 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:356 +#, fuzzy +msgid "Dump threads" +msgstr "Сваливать Память" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:91 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:324 +#, fuzzy +msgid "Show systray icon" +msgstr "Показать системном трее значок" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:96 +#, fuzzy +msgid "System tray icon enabled." +msgstr "Значок на панели задач включена." + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:98 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:110 +#, fuzzy +msgid "System tray icon feature not supported on this platform. Sorry!" +msgstr "Значок на панели задач функция не поддерживается на этой платформе. Извините!" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:101 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:113 +#, fuzzy +msgid "Warning: unable to contact the systray manager" +msgstr "Предупреждение: Не удается связаться с менеджером системный трей" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:103 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:326 +#, fuzzy +msgid "Hide systray icon" +msgstr "Скрыть системном трее значок" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:108 +#, fuzzy +msgid "System tray icon disabled." +msgstr "Значок на панели задач отключен." + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:115 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:364 +#, fuzzy +msgid "View console on startup" +msgstr "Открыть консоль при старте" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:117 +#, fuzzy +msgid "Console is to be shown on startup" +msgstr "Консоль будет показано при старте" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:118 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:366 +#, fuzzy +msgid "Do not view console on startup" +msgstr "Не рассматривают консоль при старте" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:120 +#, fuzzy +msgid "Console is not to be shown on startup" +msgstr "Консоли не будет показано при старте" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:129 +#, fuzzy +msgid "Service installed" +msgstr "Установлена служба" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:131 +#, fuzzy +msgid "Warning: unable to install the service" +msgstr "Предупреждение: не удалось установить службу" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:137 +#, fuzzy +msgid "Service removed" +msgstr "Служба удалена" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:139 +#, fuzzy +msgid "Warning: unable to remove the service" +msgstr "Предупреждение: Не удается удалить службу" + +#: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:118 +#, fuzzy +msgid "Stat filter and location updated successfully to" +msgstr "Стат фильтра и расположения успешно обновлена до" + +#: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:120 +#, fuzzy +msgid "Failed to update the stat filter and location" +msgstr "Не удалось обновить фильтра стат и местоположение" + +#: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:121 +#, fuzzy +msgid "Graph list updated, may take up to 60s to be reflected here and on the Graphs Page" +msgstr "Графика список обновляется, может занять до 60s должно быть отражено здесь и на графов странице " + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:137 +#, fuzzy +msgid "Updated settings for all pools." +msgstr "Обновление настройки для всех бассейнов." + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:142 +#, fuzzy +msgid "Exploratory tunnel configuration saved successfully." +msgstr "Разведочный конфигурации туннеля успешно сохранены." + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:144 +#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:36 +#, fuzzy +msgid "Error saving the configuration (applied but not saved) - please see the error logs." +msgstr "Ошибка при сохранении конфигурации (применяется, но не сохранили) - пожалуйста, смотрите логи ошибок." + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:11 +#, fuzzy +msgid "hop" +msgstr "хоп" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:12 +#, fuzzy +msgid "tunnel" +msgstr "туннель" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:14 +#, fuzzy +msgid "hops" +msgstr "хопа" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:15 +#, fuzzy +msgid "tunnels" +msgstr "туннели" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:26 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:40 +#, fuzzy +msgid "Exploratory tunnels" +msgstr "Разведочные туннели" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:46 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:60 +#, fuzzy +msgid "Client tunnels for" +msgstr "Клиентские туннели для" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:69 +#, fuzzy +msgid "ANONYMITY WARNING - Settings include 0-hop tunnels." +msgstr "АНОНИМНОСТЬ ПРЕДУПРЕЖДЕНИЕ - Настройки включают 0-хоп туннелей." + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:74 +#, fuzzy +msgid "ANONYMITY WARNING - Settings include 1-hop tunnels." +msgstr "ANONYMITY WARNING - Settings include 1-hop tunnels." + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:77 +#, fuzzy +msgid "PERFORMANCE WARNING - Settings include very long tunnels." +msgstr "ИСПОЛНЕНИИ ВНИМАНИЕ - настройки включают в себя очень длинные туннели." + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:80 +#, fuzzy +msgid "PERFORMANCE WARNING - Settings include high tunnel quantities." +msgstr "ИСПОЛНЕНИИ ВНИМАНИЕ - настройки включают в больших количествах туннель." + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:82 +#, fuzzy +msgid "Inbound" +msgstr "Входящий" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:82 +#, fuzzy +msgid "Outbound" +msgstr "Исходящие" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:87 +#, fuzzy +msgid "Length" +msgstr "Лесото" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:104 +#, fuzzy +msgid "Randomization" +msgstr "Рандомизации" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:128 +#, fuzzy +msgid "Quantity" +msgstr "Колич." + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:145 +#, fuzzy +msgid "Backup quantity" +msgstr "Резервное копирование количестве" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:167 +#, fuzzy +msgid "Inbound options" +msgstr "Входящий конфигурации" + +#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:180 +#, fuzzy +msgid "Outbound options" +msgstr "Исходящие конфигурации" + +#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:31 +#, fuzzy +msgid "Theme change saved." +msgstr "Изменение сохраненной тема." + +#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:33 +#, fuzzy +msgid "Refresh the page to view." +msgstr "Обновите страницу, чтобы просмотреть." + +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:41 +#, fuzzy +msgid "English" +msgstr "Английский" + +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:41 +#, fuzzy +msgid "French" +msgstr "Французский" + +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:41 +#, fuzzy +msgid "German" +msgstr "Немецкий" + +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:42 +#, fuzzy +msgid "Chinese" +msgstr "Китайский" + +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:42 +#, fuzzy +msgid "Dutch" +msgstr "Голландский" + +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:42 +#, fuzzy +msgid "Russian" +msgstr "Русский" + +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:42 +#, fuzzy +msgid "Swedish" +msgstr "Шведский" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:56 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:310 +#, fuzzy +msgid "Check for updates" +msgstr "Проверка обновлений" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:63 +#, fuzzy +msgid "Update available, attempting to download now" +msgstr "Доступно обновление, пытаясь загрузить сейчас" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:65 +#, fuzzy +msgid "Update available, click button on left to download" +msgstr "Доступные обновления, нажмите кнопку на левой скачать" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:67 +#, fuzzy +msgid "No update available" +msgstr "Нет доступных обновлений" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:75 +#, fuzzy +msgid "Updating news URL to" +msgstr "Обновление новостей на URL" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:83 +#, fuzzy +msgid "Updating proxy host to" +msgstr "Обновление прокси-сервера для" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:91 +#, fuzzy +msgid "Updating proxy port to" +msgstr "Обновление прокси порта" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:104 +#, fuzzy +msgid "Updating refresh frequency to" +msgstr "Обновление частоту обновления для" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:111 +#, fuzzy +msgid "Updating update policy to" +msgstr "Updating update rules to" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:120 +#, fuzzy +msgid "Updating update URLs." +msgstr "Обновляет обновления URL-адресов." + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:128 +#, fuzzy +msgid "Updating trusted keys." +msgstr "Обновление доверенных ключей." + +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:136 +#, fuzzy +msgid "Updating unsigned update URL to" +msgstr "Обновление неподписанных URL обновления" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:75 +#: ../java/src/net/i2p/router/web/GraphHelper.java:115 +#, fuzzy +msgid "Never" +msgstr "Никогда" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:77 +#, fuzzy +msgid "Every" +msgstr "Каждый" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:90 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:92 +#, fuzzy +msgid "Notify only" +msgstr "Сообщите только" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:95 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:97 +#, fuzzy +msgid "Download and verify only" +msgstr "Скачать и проверить только" + +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:101 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:103 +#, fuzzy +msgid "Download, verify, and restart" +msgstr "Скачать, проверки и перезапуск" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:107 +#, fuzzy +msgid "Configure Graph Display" +msgstr "Конфигурация Диаграмм Дисплея" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:107 +#, fuzzy +msgid "Select Stats" +msgstr "Выберите статистику" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:109 +#, fuzzy +msgid "Periods" +msgstr "Периоды" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:110 +#, fuzzy +msgid "Plot averages" +msgstr "Среднее значение диаграммы" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:111 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:405 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:336 +#, fuzzy +msgid "or" +msgstr "или" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:111 +#, fuzzy +msgid "plot events" +msgstr "показания диаграммы" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:112 +#, fuzzy +msgid "Image sizes" +msgstr "Размеры изображения" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:112 +#, fuzzy +msgid "width" +msgstr "ширина" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:113 +#, fuzzy +msgid "height" +msgstr "высота" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:113 +#: ../java/src/net/i2p/router/web/GraphHelper.java:114 +#, fuzzy +msgid "pixels" +msgstr "пиксели" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:115 +#, fuzzy +msgid "Refresh delay" +msgstr "Задержка обновления" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:115 +#, fuzzy +msgid "hour" +msgstr "час" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:115 +#, fuzzy +msgid "minute" +msgstr "минута" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:115 +#, fuzzy +msgid "minutes" +msgstr "минуты" + +#: ../java/src/net/i2p/router/web/GraphHelper.java:116 +#, fuzzy +msgid "Redraw" +msgstr "Перерисовать" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:59 +#, fuzzy +msgid "Network Database RouterInfo Lookup" +msgstr "Поиск Информации о Маршрутизаторе Базы Данных Сети" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:74 +#, fuzzy +msgid "Router" +msgstr "Маршрутизатор" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:74 +#, fuzzy +msgid "not found in network database" +msgstr "не найдено в сети баз данных" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:82 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:134 +#, fuzzy +msgid "Network Database Contents" +msgstr "База Данных Содержание" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:83 +#, fuzzy +msgid "View RouterInfo" +msgstr "Открыть Маршрутизатор Информация" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:84 +#, fuzzy +msgid "LeaseSets" +msgstr "АрендаНаборы" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92 +#, fuzzy +msgid "LeaseSet" +msgstr "АрендаНаборы" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:94 +#, fuzzy +msgid "Local" +msgstr "Локальный" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#, fuzzy +msgid "Unpublished" +msgstr "Неопубликованные" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:97 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:104 +#, fuzzy +msgid "Destination" +msgstr "Направление" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:114 +#, fuzzy, java-format +msgid "Expires in {0}" +msgstr "Срок истекает в {0}" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:116 +#, fuzzy, java-format +msgid "Expired {0} ago" +msgstr "Истек {0} назад" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:118 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:156 +#, fuzzy +msgid "Gateway" +msgstr "Шлюз" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:118 +#, fuzzy +msgid "Lease" +msgstr "Аренда" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:120 +#, fuzzy +msgid "Tunnel" +msgstr "Туннель" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:134 +#, fuzzy +msgid "View LeaseSets" +msgstr "Смотреть на Аренду-Наборы" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:136 +#, fuzzy +msgid "Not initialized" +msgstr "Не инициализируется" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:145 +#, fuzzy +msgid "Routers" +msgstr "Маршрутизаторы" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:147 +#, fuzzy +msgid "Show all routers" +msgstr "Показать все маршрутизаторы" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:149 +#, fuzzy +msgid "Show all routers with full stats" +msgstr "Показать все маршрутизаторы с полной статистики" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184 +#, fuzzy +msgid "Network Database Router Statistics" +msgstr "Сетевая База Данных Статистики Маршрутизатора" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:204 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:222 +#, fuzzy +msgid "Count" +msgstr "Количество" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:154 +#, fuzzy +msgid "Version" +msgstr "Версия" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:204 +#, fuzzy +msgid "Transports" +msgstr "Транспортные" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:222 +#, fuzzy +msgid "Country" +msgstr "Страна" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:254 +#, fuzzy +msgid "Our info" +msgstr "Наша информация" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:256 +#, fuzzy +msgid "Peer info for" +msgstr "Информация о пире" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:260 +#, fuzzy +msgid "Full entry" +msgstr "Полная запись" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:96 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:581 +#, fuzzy +msgid "Hidden" +msgstr "Скрыто" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:266 +#, fuzzy +msgid "Updated" +msgstr "Обновлено" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:267 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:270 +#, fuzzy, java-format +msgid "{0} ago" +msgstr "{0} назад" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:269 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:273 +#, fuzzy +msgid "Published" +msgstr "Опубликован" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:275 +#, fuzzy +msgid "Address(es)" +msgstr "Адреса" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:308 +#, fuzzy +msgid "Hidden or starting up" +msgstr "Скрытая или запуском" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:308 +#, fuzzy +msgid "SSU" +msgstr "SSU" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:308 +#, fuzzy +msgid "SSU with introducers" +msgstr "SSU с поручителями" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:309 +#, fuzzy +msgid "NTCP" +msgstr "NTCP" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:309 +#, fuzzy +msgid "NTCP and SSU" +msgstr "NTCP и SSU" + +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:309 +#, fuzzy +msgid "NTCP and SSU with introducers" +msgstr "NTCP и SSU с поручителями" + +#: ../java/src/net/i2p/router/web/NewsFetcher.java:80 +#, fuzzy, java-format +msgid "News last updated {0} ago." +msgstr "Новости Последнее обновление {0} назад." + +#: ../java/src/net/i2p/router/web/NewsFetcher.java:86 +#, fuzzy, java-format +msgid "News last checked {0} ago." +msgstr "Новости Последняя проверка: {0} назад." + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:72 +#, fuzzy +msgid "Peer Profiles" +msgstr "Профили Пиров" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:73 +#, fuzzy, java-format +msgid "Showing {0} recent profiles." +msgstr "Показаны {0} последних профилей." + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:75 +#, fuzzy, java-format +msgid "Hiding {0} older profiles." +msgstr "Сокрытие {0} взрослыми профилей." + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:77 +#, fuzzy, java-format +msgid "Hiding {0} standard profiles." +msgstr "Сокрытие {0} стандартных профилей." + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:82 +#, fuzzy +msgid "Groups (Caps)" +msgstr "Группы (Способности)" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:83 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:251 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:334 +#, fuzzy +msgid "Speed" +msgstr "Скорость" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:84 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:253 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:338 +#, fuzzy +msgid "Capacity" +msgstr "Способность" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:85 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:255 +#, fuzzy +msgid "Integration" +msgstr "Интеграция" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:86 +#, fuzzy +msgid "Status" +msgstr "Статус" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:126 +#, fuzzy +msgid "Fast, High Capacity" +msgstr "Быстрый, Высокая Производительная Мощность" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:127 +#, fuzzy +msgid "High Capacity" +msgstr "Высокая производительная мощность" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:128 +#, fuzzy +msgid "Standard" +msgstr "Стандартный" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:129 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:163 +#, fuzzy +msgid "Failing" +msgstr "В противном случае" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#, fuzzy +msgid "Integrated" +msgstr "Интегрированные" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:162 +#, fuzzy +msgid "Banned" +msgstr "Запрещена" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:164 +#, fuzzy +msgid "Unreachable" +msgstr "Недоступные" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:171 +#, fuzzy +msgid "Test Fails" +msgstr "Испытание Неудачи" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:175 +#, fuzzy +msgid "profile" +msgstr "профиль" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:184 +#, fuzzy +msgid "Floodfill and Integrated Peers" +msgstr "Floodfill и Интегрированные Пиры" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:188 +#, fuzzy +msgid "Caps" +msgstr "Предельные" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:189 +#, fuzzy +msgid "Integ. Value" +msgstr "Интегрированное значение" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:190 +#, fuzzy +msgid "Last Heard About" +msgstr "Последний Слышали О" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:191 +#, fuzzy +msgid "Last Heard From" +msgstr "Последний Раз Слышали От" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:192 +#, fuzzy +msgid "Last Good Send" +msgstr "Последний Хорошо Отправить" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:193 +#, fuzzy +msgid "Last Bad Send" +msgstr "Последний Плохо Отправить" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:194 +#, fuzzy +msgid "10m Resp. Time" +msgstr "10 мин. Время отклика" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:195 +#, fuzzy +msgid "1h Resp. Time" +msgstr "1 час Время отклика" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:196 +#, fuzzy +msgid "1d Resp. Time" +msgstr "1 день Время отклика" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:197 +#, fuzzy +msgid "Last Good Lookup" +msgstr "Последний Хороший Поиск" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:198 +#, fuzzy +msgid "Last Bad Lookup" +msgstr "Последний Плохо Поиска" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:199 +#, fuzzy +msgid "Last Good Store" +msgstr "Последний Хорошо Хранения" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200 +#, fuzzy +msgid "Last Bad Store" +msgstr "Последний Плохо Хранения" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:201 +#, fuzzy +msgid "1h Fail Rate" +msgstr "1ч Интенсивность Отказов" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202 +#, fuzzy +msgid "1d Fail Rate" +msgstr "1д Интенсивность Отказов" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:250 +#, fuzzy +msgid "Thresholds" +msgstr "Порог" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:252 +#, fuzzy +msgid "fast peers" +msgstr "быстрые пиры" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:254 +#, fuzzy +msgid "high capacity peers" +msgstr "пиры у которых высокая производительная мощность" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:256 +#, fuzzy +msgid " well integrated peers" +msgstr "хорошо интегрированные пиры" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:257 +#, fuzzy +msgid "Definitions" +msgstr "Определение" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:258 +#, fuzzy +msgid "as determined by the profile organizer" +msgstr "как определяется профилем организатор" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:258 +#, fuzzy +msgid "groups" +msgstr "группы" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 +#, fuzzy +msgid "capabilities in the netDb, not used to determine profiles" +msgstr "возможности в сетьБД, не используются для определения профилей" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 +#, fuzzy +msgid "caps" +msgstr "пределы" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 +#, fuzzy +msgid "peak throughput (bytes per second) over a 1 minute period that the peer has sustained in a single tunnel" +msgstr "Пик производительности (байт в секунду) в течение 1 минуты периода, что партнер имеет выдержанный в одном туннеле" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 +#, fuzzy +msgid "speed" +msgstr "скорость" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 +#, fuzzy +msgid "capacity" +msgstr "потенциала" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 +#, fuzzy +msgid "how many tunnels can we ask them to join in an hour?" +msgstr "cколько туннелей мы можем попросить их присоединиться к часу?" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 +#, fuzzy +msgid "how many new peers have they told us about lately?" +msgstr "сколько новых узлов не нам сказали последнее время?" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 +#, fuzzy +msgid "integration" +msgstr "интеграция" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 +#, fuzzy +msgid "is the peer banned, or unreachable, or failing tunnel tests?" +msgstr "это совокупность запрещены или недоступны, или не туннель тесты?" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 +#, fuzzy +msgid "status" +msgstr "статус" + +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:321 +#, fuzzy +msgid "n/a" +msgstr "не доступно" + +#: ../java/src/net/i2p/router/web/ShitlistRenderer.java:57 +#, fuzzy, java-format +msgid "Temporary ban expiring in {0}" +msgstr "Временного запрета истекает в {0}" + +#: ../java/src/net/i2p/router/web/ShitlistRenderer.java:59 +#, fuzzy, java-format +msgid "Banned until restart or in {0}" +msgstr "Запрещены до перезагрузку через {0}" + +#: ../java/src/net/i2p/router/web/ShitlistRenderer.java:71 +#, fuzzy +msgid "unban now" +msgstr "удалить запрета сейчас" + +#: ../java/src/net/i2p/router/web/StatsGenerator.java:58 +#, fuzzy +msgid "Statistics gathered during this router's uptime" +msgstr "Статистические данные, полученные во время проведенное на сайте этого маршрутизатора" + +#: ../java/src/net/i2p/router/web/StatsGenerator.java:61 +#, fuzzy +msgid "The data gathered is quantized over a 1 minute period, so should just be used as an estimate." +msgstr "Данные собраны квантуется более 1 минуты периода, поэтому следует использовать в качестве оценки." + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:44 +#, fuzzy +msgid "Configure startup of clients and webapps (services); manually start dormant services" +msgstr "Настройка запуска клиентов и Webapps (услуг); вручную запустить покоя услуги" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:46 +#, fuzzy +msgid "I2P Services" +msgstr "Сервисы I2P" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:52 +#, fuzzy +msgid "Manage your I2P hosts file here (I2P domain name resolution)" +msgstr "Управляйте своими I2P хостов файла здесь (I2P доменных имен)" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:54 +#, fuzzy +msgid "Addressbook" +msgstr "Адресная Книжка" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:58 +#, fuzzy +msgid "Built-in anonymous BitTorrent Client" +msgstr "Встроенные в анонимной загрузки клиента" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:60 +#, fuzzy +msgid "Torrents" +msgstr "Торренты" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:64 +#, fuzzy +msgid "Anonymous webmail client" +msgstr "Аноним электронной почтовый веб-клиент" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:66 +#, fuzzy +msgid "Webmail" +msgstr "Веб-Почта" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:70 +#, fuzzy +msgid "Anonymous resident webserver" +msgstr "Аноним сервер резидента" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:72 +#, fuzzy +msgid "Webserver" +msgstr "Веб-Сервер" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:76 +#, fuzzy +msgid "Configure I2P Router" +msgstr "Настройка Маршрутизатора I2P" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:78 +#, fuzzy +msgid "I2P Internals" +msgstr "Внутренняя Организация I2P" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:84 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#, fuzzy +msgid "View existing tunnels and tunnel build status" +msgstr "Просмотр существующих туннелей и туннелей построить статус" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:90 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:225 +#, fuzzy +msgid "Show all current peer connections" +msgstr "Показать все текущие подключения сверстников" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:96 +#, fuzzy +msgid "Show recent peer performance profiles" +msgstr "Показать последних профили производительности сверстников" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:98 +#, fuzzy +msgid "Profiles" +msgstr "Профили" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:102 +#, fuzzy +msgid "Show list of all known I2P routers" +msgstr "Показать список всех известных I2P маршрутизаторы" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:104 +#, fuzzy +msgid "NetDB" +msgstr "СетьДБ" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:108 +#, fuzzy +msgid "Health Report" +msgstr "Доклад о Состоянии Здравоохранения" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:110 +#, fuzzy +msgid "Logs" +msgstr "Логи" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:114 +#, fuzzy +msgid "Show the router's workload, and how it's performing" +msgstr "Показать нагрузку на маршрутизатор, и как это исполняющей" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:116 +#, fuzzy +msgid "Jobs" +msgstr "Задачи" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#, fuzzy +msgid "Graph router performance" +msgstr "График производительности маршрутизатора" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#, fuzzy +msgid "Graphs" +msgstr "Диаграммы" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:126 +#, fuzzy +msgid "Textual router performance statistics" +msgstr "Текстовое маршрутизатора статистики по эффективности" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#, fuzzy +msgid "I2P Router Help" +msgstr "I2P Помощь Маршрутизатор" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#, fuzzy +msgid "General" +msgstr "Общий" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:143 +#, fuzzy +msgid "Your unique I2P router identity is" +msgstr "Ваш уникальный I2P маршрутизатора идентичность" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 +#, fuzzy +msgid "never reveal it to anyone" +msgstr "никогда не показывайте его никому" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:149 +#, fuzzy +msgid "Local Identity" +msgstr "Локальный Адрес" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:161 +#, fuzzy +msgid "How long we've been running for this session" +msgstr "Как долго мы уже в течение этой сессии" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#, fuzzy +msgid "Uptime" +msgstr "Аптайм" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 +#, fuzzy +msgid "Help with configuring your firewall and router for optimal I2P performance" +msgstr "Помощь в настройке брандмауэра и маршрутизатора для обеспечения оптимальной производительности I2P" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#, fuzzy +msgid "Download" +msgstr "Загрузка" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:207 +#, fuzzy +msgid "Download Unsigned" +msgstr "Загрузка Неподписанных" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 +#, fuzzy +msgid "Active" +msgstr "Активные" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:241 +#, fuzzy +msgid "Fast" +msgstr "Быстрые" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:247 +#, fuzzy +msgid "High capacity" +msgstr "Высокая производительная мощность" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 +#, fuzzy +msgid "Known" +msgstr "Общепризнанные" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:274 +#, fuzzy +msgid "Help with firewall configuration" +msgstr "Помощь в настройке брандмауэра" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:276 +#, fuzzy +msgid "Check NAT/firewall" +msgstr "Проверка NAT/брандмауэры" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#, fuzzy +msgid "Reseed" +msgstr "Повтор Первой Сети Связи" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:313 +#, fuzzy +msgid "Configure router bandwidth allocation" +msgstr "Настройка маршрутизатора распределения пропускной способностью" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:315 +#, fuzzy +msgid "Bandwidth in/out" +msgstr "Пропускная способность входящего / выходящего" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#, fuzzy +msgid "Total" +msgstr "Всего" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:340 +#, fuzzy +msgid "Used" +msgstr "Колич." + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:350 +#, fuzzy +msgid "Tunnels in/out" +msgstr "Туннели входящие / выходящие " + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:355 +#, fuzzy +msgid "Exploratory" +msgstr "Разведочные" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:371 +#, fuzzy +msgid "Participating" +msgstr "Участвующие" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:377 +#, fuzzy +msgid "What's in the router's job queue?" +msgstr "Что в очереди заданий маршрутизатор?" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:379 +#, fuzzy +msgid "Congestion" +msgstr "Перегрузка" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:384 +#, fuzzy +msgid "Job lag" +msgstr "Задержка задачи" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 +#, fuzzy +msgid "Message delay" +msgstr "Задержка доставки сообщения" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:396 +#, fuzzy +msgid "Tunnel lag" +msgstr "Задержка туннеля" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 +#, fuzzy +msgid "Backlog" +msgstr "Очередь" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:73 +#, fuzzy +msgid "skew" +msgstr "отклонение" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:92 +#, fuzzy +msgid "ERR-Client Manager I2CP Error - check logs" +msgstr "ОШИБКА-менеджер клиентов I2CP ошибка - проверьте журналы" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:94 +#, fuzzy +msgid "ERR-ClockSkew" +msgstr "ОШИБКА-ЧасиОтклонение" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:103 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:557 +#, fuzzy +msgid "OK" +msgstr "ОК" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:104 +#, fuzzy +msgid "ERR-Private TCP Address" +msgstr "ОШИБКА Частные TCP-адрес" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:106 +#, fuzzy +msgid "ERR-SymmetricNAT" +msgstr "ОШИБКА - Симметричный-NAT" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:109 +#, fuzzy +msgid "WARN-Firewalled with Inbound TCP Enabled" +msgstr "ПРЕДУПРЕЖДЕНИЕ-файрвол с Входящий TCP Включено" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:111 +#, fuzzy +msgid "WARN-Firewalled and Floodfill" +msgstr "ПРЕДУПРЕЖДЕНИЕ-файрволл и Floodfill" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:113 +#, fuzzy +msgid "WARN-Firewalled and Fast" +msgstr "ПРЕДУПРЕЖДЕНИЕ-файрволл и быстро" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:114 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:561 +#, fuzzy +msgid "Firewalled" +msgstr "За Брандмауэром" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:116 +#, fuzzy +msgid "ERR-UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and restart" +msgstr "ОШИБКА UDP-порта в использовании - Задать i2np.udp.internalPort=xxxx Расширенный конфигурации и перезапустить" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:123 +#, fuzzy +msgid "ERR-UDP Disabled and Inbound TCP host/port not set" +msgstr "ERROR-UDP Disabled and Inbound TCP host/port not set" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:125 +#, fuzzy +msgid "WARN-Firewalled with UDP Disabled" +msgstr "ПРЕДУПРЕЖДЕНИЕ-файрвол с UDP отключено" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:127 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:577 +#, fuzzy +msgid "Testing" +msgstr "Проверка" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:360 +#, fuzzy +msgid "Add/remove/edit & control your client and server tunnels" +msgstr "Добавлять / удалять / редактировать и управлять вашим клиентом и сервером туннелей" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:360 +#, fuzzy +msgid "Local Destinations" +msgstr "Локальные Пункты Назначения" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:369 +#, fuzzy +msgid "Server" +msgstr "Сервер" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:373 +#, fuzzy +msgid "Show tunnels" +msgstr "Показать туннелей" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:384 +#, fuzzy +msgid "Leases expired" +msgstr "Срока аренды" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:384 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:385 +#, fuzzy +msgid "Rebuilding" +msgstr "Восстановление" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:385 +#, fuzzy +msgid "ago" +msgstr "назад" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:388 +#, fuzzy +msgid "Ready" +msgstr "Готовый" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:392 +#, fuzzy +msgid "Building" +msgstr "Строительство" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:392 +#, fuzzy +msgid "Building tunnels" +msgstr "Строительство туннелей" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:404 +#: ../java/strings/Strings.java:36 +#, fuzzy +msgid "shared clients" +msgstr "общие клиенты" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:40 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:62 +#, fuzzy +msgid "configure" +msgstr "конфигурировать" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:64 +#, fuzzy +msgid "dead" +msgstr "мертвый" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70 +#, fuzzy +msgid "Participating tunnels" +msgstr "Участвующие туннели" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71 +#, fuzzy +msgid "From" +msgstr "От" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71 +#, fuzzy +msgid "Receive on" +msgstr "Получить на" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 +#, fuzzy +msgid "Expiration" +msgstr "Истечение срока" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 +#, fuzzy +msgid "Send on" +msgstr "Отправить по" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 +#, fuzzy +msgid "To" +msgstr "К" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73 +#, fuzzy +msgid "Rate" +msgstr "Ставка" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73 +#, fuzzy +msgid "Role" +msgstr "Роль" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:156 +#, fuzzy +msgid "Usage" +msgstr "Использование" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:107 +#, fuzzy +msgid "grace period" +msgstr "льготный период" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:117 +#, fuzzy +msgid "Outbound Endpoint" +msgstr "Исходящие Конечная точка" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:119 +#, fuzzy +msgid "Inbound Gateway" +msgstr "Входящий Сетевой Шлюз" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:121 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 +#, fuzzy +msgid "Participant" +msgstr "Участник" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:126 +#, fuzzy +msgid "Inactive participating tunnels" +msgstr "Неактивные участвующие туннелей" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:127 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:216 +#, fuzzy +msgid "Lifetime bandwidth usage" +msgstr "Использование долговечной пропускной способности входящего канала" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:156 +#, fuzzy +msgid "Expiry" +msgstr "Истечение Срока" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:156 +#, fuzzy +msgid "In/Out" +msgstr "Входящего / Выходящего" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:159 +#, fuzzy +msgid "Participants" +msgstr "Участники" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:165 +#, fuzzy +msgid "Endpoint" +msgstr "Конечная Точка" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:205 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211 +#, fuzzy +msgid "Build in progress" +msgstr "Опираясь на данном моменте" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:205 +#, fuzzy +msgid "inbound" +msgstr "входящий" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211 +#, fuzzy +msgid "outbound" +msgstr "исходящий" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:215 +#, fuzzy +msgid "No tunnels; waiting for the grace period to end." +msgstr "Нет туннелях, ожидая льготного периода и до конца." + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:216 +#, fuzzy +msgid "in" +msgstr "входящий" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:217 +#, fuzzy +msgid "out" +msgstr "исходящий" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:234 +#, fuzzy +msgid "Tunnel Counts By Peer" +msgstr "Тоннель графов По Пиру" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:235 +#, fuzzy +msgid "% of total" +msgstr "% всего" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:235 +#, fuzzy +msgid "Expl. + Client" +msgstr "Разведочной + Клиентский" + +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:235 +#, fuzzy +msgid "Part. from + to" +msgstr "Участие от + до" + +#: ../java/strings/Strings.java:12 +#, fuzzy +msgid "addressbook" +msgstr "адресная книжка" + +#: ../java/strings/Strings.java:13 +#, fuzzy +msgid "i2psnark" +msgstr "i2psnark" + +#: ../java/strings/Strings.java:14 +#, fuzzy +msgid "i2ptunnel" +msgstr "i2p-туннель" + +#: ../java/strings/Strings.java:15 +#, fuzzy +msgid "susimail" +msgstr "susi-почта" + +#: ../java/strings/Strings.java:16 +#, fuzzy +msgid "susidns" +msgstr "susidns" + +#: ../java/strings/Strings.java:17 +#, fuzzy +msgid "routerconsole" +msgstr "маршрутизатор-консоли" + +#: ../java/strings/Strings.java:22 +#, fuzzy +msgid "Web console" +msgstr "Веб-консоль" + +#: ../java/strings/Strings.java:23 +#, fuzzy +msgid "SAM application bridge" +msgstr "Мост приложения SAM" + +#: ../java/strings/Strings.java:24 +#, fuzzy +msgid "Application tunnels" +msgstr "Применение туннелей" + +#: ../java/strings/Strings.java:25 +#, fuzzy +msgid "My eepsite web server" +msgstr "Мой веб-сервер «eepsite»" + +#: ../java/strings/Strings.java:26 +#, fuzzy +msgid "I2P webserver (eepsite)" +msgstr "Мой веб-сервер «eepsite»" + +#: ../java/strings/Strings.java:27 +#, fuzzy +msgid "Browser launch at startup" +msgstr "Запуск браузера при запуске I2P" + +#: ../java/strings/Strings.java:28 +#, fuzzy +msgid "BOB application bridge" +msgstr "Мост приложения BOB" + +#: ../java/strings/Strings.java:30 +#, fuzzy +msgid "Open Router Console in web browser at startup" +msgstr "Открыть консоль маршрутизатора в веб-браузере при запуске" + +#: ../java/strings/Strings.java:37 +#, fuzzy +msgid "IRC proxy" +msgstr "IRC прокси" + +#: ../java/strings/Strings.java:38 +#, fuzzy +msgid "eepsite" +msgstr "eepsite" + +#: ../java/strings/Strings.java:39 +#, fuzzy +msgid "I2P webserver" +msgstr "I2P web-server" + +#: ../java/strings/Strings.java:40 +#, fuzzy +msgid "HTTP Proxy" +msgstr "HTTP Прокси" + +#: ../java/strings/Strings.java:42 +#, fuzzy +msgid "eepProxy" +msgstr "eep-Прокси" + +#: ../java/strings/Strings.java:43 +#, fuzzy +msgid "ircProxy" +msgstr "irc-Прокси" + +#: ../java/strings/Strings.java:45 +#, fuzzy +msgid "I2PSnark" +msgstr "I2PSnark" + +#: ../java/strings/Strings.java:47 +#, fuzzy +msgid "iMule" +msgstr "iMule" + +#: ../java/strings/Strings.java:51 +#, fuzzy +msgid "classic" +msgstr "классическая" + +#: ../java/strings/Strings.java:52 +#, fuzzy +msgid "dark" +msgstr "темная" + +#: ../java/strings/Strings.java:53 +#, fuzzy +msgid "light" +msgstr "светлая" + +#: ../java/strings/Strings.java:54 +#, fuzzy +msgid "midnight" +msgstr "полуночная" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:106 +#, fuzzy +msgid "config networking" +msgstr "конфигурация сети" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:217 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:218 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:217 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:217 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:231 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:217 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:217 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:218 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:217 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:217 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:217 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:228 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:217 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/index_jsp.java:223 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:216 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:216 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:216 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:216 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:216 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:216 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:236 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:216 +#, fuzzy +msgid "Refresh (s)" +msgstr "Обновить (сек)" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:221 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:222 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:221 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:221 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:235 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:221 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:221 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:222 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:221 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:221 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:221 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:224 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:232 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:221 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:224 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/index_jsp.java:227 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:224 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:224 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:239 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:220 +#, fuzzy +msgid "Enable" +msgstr "Включать" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:241 +#, fuzzy +msgid "I2P Network Configuration" +msgstr "I2P Настройке Сети" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:297 +#, fuzzy +msgid "Bandwidth limiter" +msgstr "Ограничитель диапазона частот" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:299 +#, fuzzy +msgid "I2P will work best if you configure your rates to match the speed of your internet connection." +msgstr "I2P будет работать лучше, если Вы настроите частоту для подбора соответствующей скорости подсоединения к Интернету." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:303 +#, fuzzy +msgid "KBps In" +msgstr "Кбит/сек Загруженное" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:317 +#, fuzzy +msgid "KBps Out" +msgstr "Кбит/сек Закаченное" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:333 +#, fuzzy +msgid "Share" +msgstr "Поделено" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:340 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:307 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:303 +#, fuzzy +msgid "NOTE" +msgstr "ЗАМЕТЬТЕ" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:342 +#, fuzzy, java-format +msgid "You have configured I2P to share only {0} KBps." +msgstr "Вы настроили протокол I2P, чтоб использовать только {0} килобит информации за секунду." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:345 +#, fuzzy +msgid "I2P requires at least 12KBps to enable sharing. " +msgstr "I2P требует, по крайней мере 12KBps чтобы поделить трафик. " + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:346 +#, fuzzy +msgid "Please enable sharing (participating in tunnels) by configuring more bandwidth. " +msgstr "Пожалуйста, включите поделен трафик (участие в туннелях), настроя больше пропускной способностью. " + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:347 +#, fuzzy +msgid "It improves your anonymity by creating cover traffic, and helps the network." +msgstr "Это улучшает вашу анонимность создавая покрытия трафика, а также помогает в сети." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:350 +#, fuzzy, java-format +msgid "You have configured I2P to share {0} KBps." +msgstr "Вы настроили протокол I2P, чтоб использовать {0} килобит информации за секунду." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:353 +#, fuzzy +msgid "The higher the share bandwidth the more you improve your anonymity and help the network." +msgstr "Чем больше пропускная способность входящего/исходящего канала расшаренного ресурса, тем больше Вы поддерживаете анонимность и тем самым помогаете сети." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:359 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:496 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:305 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:324 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:335 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:375 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:343 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:323 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:356 +#, fuzzy +msgid "Cancel" +msgstr "Отклонить изменения" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:363 +#, fuzzy +msgid "IP and Transport Configuration" +msgstr "IP и конфигурации транспорта" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:365 +#, fuzzy +msgid "The default settings will work for most people." +msgstr "Настройки по умолчанию будет работать для большинства людей." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:367 +#, fuzzy +msgid "There is help below." +msgstr "Дополнительную информацию смотрите ниже:" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:369 +#, fuzzy +msgid "UPnP Configuration" +msgstr "Конфигурация UPnP" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:373 +#, fuzzy +msgid "Enable UPnP to open firewall ports" +msgstr "Запустите UPnP, чтоб открыть порты брандмауэра" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:375 +#, fuzzy +msgid "UPnP status" +msgstr "статус UPnP" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:377 +#, fuzzy +msgid "IP Configuration" +msgstr "IP Конфигурация" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:379 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:441 +#, fuzzy +msgid "Externally reachable hostname or IP address" +msgstr "Внешне достижимое имя хоста или IP -адрес" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:383 +#, fuzzy +msgid "Use all auto-detect methods" +msgstr "Используйте все методы автоматического опознавания" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:387 +#, fuzzy +msgid "Disable UPnP IP address detection" +msgstr "Отключите детектор IP-адреса UPnP" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:391 +#, fuzzy +msgid "Ignore local interface IP address" +msgstr "Отклоните IP адрес локального интерфейса." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:395 +#, fuzzy +msgid "Use SSU IP address detection only" +msgstr "Используйте только детектор IP- адреса SSU" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:399 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:459 +#, fuzzy +msgid "Specify hostname or IP" +msgstr "Установите имя хоста или IP" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:405 +#, fuzzy +msgid "Select Interface" +msgstr "Выбирать Интерфейс" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:419 +#, fuzzy +msgid "Hidden mode - do not publish IP" +msgstr "Скрытый метод – не разглашайте IP адрес" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:421 +#, fuzzy +msgid "(prevents participating traffic)" +msgstr "(препятствует причастному трафику)" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:423 +#, fuzzy +msgid "UDP Configuration:" +msgstr "UDP Конфигурация" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:425 +#, fuzzy +msgid "UDP port:" +msgstr "UDP Порт:" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:439 +#, fuzzy +msgid "TCP Configuration" +msgstr "TCP Конфигурация" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:445 +#, fuzzy +msgid "Use auto-detected IP address" +msgstr "Используйте только автоматически распознанный IP -адрес" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:447 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 +#, fuzzy +msgid "currently" +msgstr "в настоящее время" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:451 +#, fuzzy +msgid "if we are not firewalled" +msgstr "если есть доступ к порту." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:455 +#, fuzzy +msgid "Always use auto-detected IP address (Not firewalled)" +msgstr "Всегда используйте только автоматически распознанный IP-адрес (а не адрес брандмауэра)" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:465 +#, fuzzy +msgid "Disable inbound (Firewalled)" +msgstr "Отключите входящие (за брандмауэром)" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:469 +#, fuzzy +msgid "Completely disable" +msgstr "Полностью отключите" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:471 +#, fuzzy +msgid "(select only if behind a firewall that throttles or blocks outbound TCP)" +msgstr "(выберете, только если брандмауэр тормозит работу или блокирует выходные данные протокола управления передачей данных)" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:473 +#, fuzzy +msgid "Externally reachable TCP port" +msgstr "Внешне достижимый порт протокола TCP" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:477 +#, fuzzy +msgid "Use the same port configured for UDP" +msgstr "Используйте тот же порт, настроенный для протокола UDP" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:485 +#, fuzzy +msgid "Specify Port" +msgstr "Определите Порт" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:489 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:342 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:329 +#, fuzzy +msgid "Note" +msgstr "Заметьте" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:492 +#, fuzzy +msgid "Changing these settings will restart your router." +msgstr "При изменении настроек, происходит перезагрузка маршрутизатора." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:498 +#, fuzzy +msgid "Configuration Help" +msgstr "Помощь конфигурации" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:500 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:549 +#, fuzzy +msgid "While I2P will work fine behind most firewalls, your speeds and network integration will generally improve if the I2P port is forwarded for both UDP and TCP." +msgstr "Хотя I2P будет прекрасно работать позади большинства брандмауэров, ваша скорость и сетевой интеграции, вероятно, улучшится, если порт I2P направляется для UDP и TCP." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:502 +#, fuzzy +msgid "If you can, please poke a hole in your firewall to allow unsolicited UDP and TCP packets to reach you." +msgstr "Если можно, сделайте, пожалуйста, отверстие в брандмауэре, чтоб самостоятельно предоставленные UDP и TCP-пакеты могли дойти до Вас." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:504 +#, fuzzy +msgid "If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole punching with \"SSU introductions\" to relay traffic." +msgstr "Если не можете, I2P поспособствует тому, чтоб UPnP (набор сетевых протоколов) и отверстие в UDP, проделанное «применением SSU» переключили трафик." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:506 +#, fuzzy +msgid "Most of the options above are for special situations, for example where UPnP does not work correctly, or a firewall not under your control is doing harm." +msgstr "Множество из перечисленных опций предназначены для использования в отдельных ситуациях, к примеру, где UPnP работает неверно, или брандмауэр находится вне контроля и причиняет вред." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:508 +#, fuzzy +msgid "Certain firewalls such as symmetric NATs may not work well with I2P." +msgstr "Некоторые брадмауэры, к примеру, симметричные NAT-устройствам (преобразования сетевых адресов) могут и «не сработаться» с I2P." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:517 +#, fuzzy +msgid "UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect the external IP address and forward ports." +msgstr "UPnP используется для связи с интернет-шлюзом (IGDs), чтоб определять внешний IP-адрес и передовые порты." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:519 +#, fuzzy +msgid "UPnP support is beta, and may not work for any number of reasons" +msgstr "Поддержка UPnP не испробована, и может не работать по нескольким причинам" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:521 +#, fuzzy +msgid "No UPnP-compatible device present" +msgstr "Отсутствие UPnP- существующее совместимое устройство" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:523 +#, fuzzy +msgid "UPnP disabled on the device" +msgstr "Выключенный UPnP в устройстве" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:525 +#, fuzzy +msgid "Software firewall interference with UPnP" +msgstr "Взаимодействие программного обеспечения брандмауэра с UPnP" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:527 +#, fuzzy +msgid "Bugs in the device's UPnP implementation" +msgstr "Ошибки при внедрении устройства UPnP" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:529 +#, fuzzy +msgid "Multiple firewall/routers in the internet connection path" +msgstr "Разнообразные брандмауэры/маршрутизаторы в способах подсоединения к интернету" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:531 +#, fuzzy +msgid "UPnP device change, reset, or address change" +msgstr "Замена устройства UPnP, перезагрузка или изменение адреса" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:533 +#, fuzzy +msgid "Review the UPnP status here." +msgstr "Обзор статуса UPnP здесь." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:535 +#, fuzzy +msgid "UPnP may be enabled or disabled above, but a change requires a router restart to take effect." +msgstr "UPnP может быть включено или отключено, но для получения желательного результата изменения требуется перезагрузка маршрутизатора." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:537 +#, fuzzy +msgid "Hostnames entered above will be published in the network database." +msgstr "Имена хоста, зарегистрированные выше, будут опубликованы в базе данных сети." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:539 +#, fuzzy +msgid "They are not private." +msgstr "Они не являются личными." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:541 +#, fuzzy +msgid "Also, do not enter a private IP address like 127.0.0.1 or 192.168.1.1." +msgstr "Также, не запишите личный IP-адрес, как 127.0.0.1 или 192.168.1.1." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:543 +#, fuzzy +msgid "If you specify the wrong IP address or hostname, or do not properly configure your NAT or firewall, your network performance will degrade substantially." +msgstr "Если Вы установите неправильный IP-адрес или имя хоста, или неправильно сконфигурируете Ваше NAT-устройство или брандмауэр, работа сети будет существенно ухудшаться." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:545 +#, fuzzy +msgid "When in doubt, leave the settings at the defaults." +msgstr "Если Вы сомневаетесь, не заходите на настройки." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:547 +#, fuzzy +msgid "Reachability Help" +msgstr "Помощь доступности" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:552 +#, fuzzy +msgid "If you think you have opened up your firewall and I2P still thinks you are firewalled, remember that you may have multiple firewalls, for example both software packages and external hardware routers." +msgstr "Если Вы думаете, что открыли Ваш брандмауэр, а протокол I2P все еще думает, что доступа к порту нет, помните, что у Вас могут быть различные брандмауэры, то есть,- и программное обеспечение, и внешние маршрутизаторы аппаратного обеспечения." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:555 +#, fuzzy +msgid "If there is an error, the logs may also help diagnose the problem." +msgstr "Если обнаружится ошибка, текстовые файлы (logs) могут помочь раскрыть сущность проблемы." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:559 +#, fuzzy +msgid "Your UDP port does not appear to be firewalled." +msgstr "Ваш UDP порт не закрыт" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:563 +#, fuzzy +msgid "Your UDP port appears to be firewalled." +msgstr "Ваш UDP-порт закрыт. Кажеться что ваш UDP порт за брандмауером." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:565 +#, fuzzy +msgid "As the firewall detection methods are not 100% reliable, this may occasionally be displayed in error." +msgstr "Поскольку методы детектирования брандмауэра не надежны на 100 %, может случайно обнаружиться ошибка." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:567 +#, fuzzy +msgid "However, if it appears consistently, you should check whether both your external and internal firewalls are open for your port." +msgstr "Однако, если окажется, последовательно, Вы должны убедиться, как внешний и внутренний брандмауэр открыт для вашего порта." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:569 +#, fuzzy +msgid "I2P will work fine when firewalled, there is no reason for concern. When firewalled, the router uses \"introducers\" to relay inbound connections." +msgstr "Сеть заработает должным образом, если будет закрыт порт, причин для беспокойства нет. Когда доступа к порту нет, маршрутизатор использует «устройство ввода», чтоб ретранслировать входящее соединение." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:571 +#, fuzzy +msgid "However, you will get more participating traffic and help the network more if you can open your firewall(s)." +msgstr "Несмотря на это, Вы получите больше сетевого трафика и тем самым поможете работе сети при условии, если откроете брандмауэры." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:573 +#, fuzzy +msgid "If you think you have already done so, remember that you may have both a hardware and a software firewall, or be behind an additional, institutional firewall you cannot control." +msgstr "Если думаете, что Вы все сделали правильно, помните, что у Вас может быть как аппаратное, так и программное оборудование, и что в обходе дополнительного, основного брандмауэра, Вы не можете контролировать." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:575 +#, fuzzy +msgid "Also, some routers cannot correctly forward both TCP and UDP on a single port, or may have other limitations or bugs that prevent them from passing traffic through to I2P." +msgstr "Также некоторые маршрутизаторы не могут правильно отсылать TCP и UDP протоколы на один порт, или же они могут иметь иные ограничения или вирусы, которые препятствуют прохождению трафика в I2P." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:579 +#, fuzzy +msgid "The router is currently testing whether your UDP port is firewalled." +msgstr "Маршрутизатор проверяет, закрыт ли Ваш UDP порт." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:583 +#, fuzzy +msgid "The router is not configured to publish its address, therefore it does not expect incoming connections." +msgstr "Маршрутизатор не конфигурируется для публикации адреса, поэтому он не ожидает входящего соединения." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:585 +#, fuzzy +msgid "WARN - Firewalled and Fast" +msgstr "ПРЕДУПРЕЖДЕНИЕ - За Брандмауэром и Быстрый" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:587 +#, fuzzy +msgid "You have configured I2P to share more than 128KBps of bandwidth, but you are firewalled." +msgstr "Вы сконфигурировали протокол I2P, чтоб использовать более, чем 128 килобайт в секунду диапазона частоты, но доступа к порту нет." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:589 +#, fuzzy +msgid "While I2P will work fine in this configuration, if you really have over 128KBps of bandwidth to share, it will be much more helpful to the network if you open your firewall." +msgstr "Хотя сеть будет должным образом работать в этой конфигурации, если Вы действительно имеете для совместного использования более 128 килобайт в секунду диапазона частот, будет лучше для сети, если б Вы открыли брандмауэр." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:591 +#, fuzzy +msgid "WARN - Firewalled and Floodfill" +msgstr "ПРЕДУПРЕЖДЕНИЕ - За Брандмауэром и Floodfill" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:593 +#, fuzzy +msgid "You have configured I2P to be a floodfill router, but you are firewalled." +msgstr "Вы настроили I2P быть floodfill маршрутизатора, но маршрутизатор за брандмауэром." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:595 +#, fuzzy +msgid "For best participation as a floodfill router, you should open your firewall." +msgstr "Для лучшей совместной работы в качестве floodfill маршрутизатора, Вы должны открыть свой брандмауэр." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:597 +#, fuzzy +msgid "WARN - Firewalled with Inbound TCP Enabled" +msgstr "ПРЕДУПРЕЖДЕНИЕ - За Брандмауэром и Входящий TCP Включено" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:599 +#, fuzzy +msgid "You have configured inbound TCP, however your UDP port is firewalled, and therefore it is likely that your TCP port is firewalled as well." +msgstr "Вы сконфигурировали входящий TCP, однако Ваш UDP порт закрыт, поэтому скорее всего Ваш TCP – порт так же закрыт." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:601 +#, fuzzy +msgid "If your TCP port is firewalled with inbound TCP enabled, routers will not be able to contact you via TCP, which will hurt the network." +msgstr "Если Ваш TCP порт закрыт входящим включенным TCP, маршрутизаторы не смогут соединиться с Вами через TCP, т.к. могут повредить сеть." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:603 +#, fuzzy +msgid "Please open your firewall or disable inbound TCP above." +msgstr "Пожалуйста, откройте свой брандмауэр или отключенный входящий порт TCP." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:605 +#, fuzzy +msgid "WARN - Firewalled with UDP Disabled" +msgstr "ПРЕДУПРЕЖДЕНИЕ - За Брандмауэром и UDP Отключенный" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:607 +#, fuzzy +msgid "You have configured inbound TCP, however you have disabled UDP." +msgstr "Вы сконфигурировали входящий TCP, но все равно Вы отключили UDP." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:609 +#, fuzzy +msgid "You appear to be firewalled on TCP, therefore your router cannot accept inbound connections." +msgstr "Вы firewalled on TCP, поэтому Ваш маршрутизатор не может принять входящие соединения." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:611 +#, fuzzy +msgid "Please open your firewall or enable UDP." +msgstr "Пожалуйста, откройте свой брандмауер или закройте UDP." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:613 +#, fuzzy +msgid "ERR - Clock Skew" +msgstr "ОШИБКА - Часы Отклонение" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:615 +#, fuzzy +msgid "Your system's clock is skewed, which will make it difficult to participate in the network." +msgstr "Вашы часы системного времени сбились, что усложнит работу в сети." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:617 +#, fuzzy +msgid "Correct your clock setting if this error persists." +msgstr "Настройте часы, если эта ошибка не исчезает." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:619 +#, fuzzy +msgid "ERR - Private TCP Address" +msgstr "ОШИБКА - Частный TCP Адрес" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:621 +#, fuzzy +msgid "You must never advertise an unroutable IP address such as 127.0.0.1 or 192.168.1.1 as your external address." +msgstr "Нельзя разглашать немаршрутизируемый IP –адрес, как 127.0.0.1 или 192.168.1.1 в качестве Вашего внешнего адреса." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:623 +#, fuzzy +msgid "Correct the address or disable inbound TCP above." +msgstr "Исправьте адрес или отключите входящий TCP сверх." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:625 +#, fuzzy +msgid "ERR - SymmetricNAT" +msgstr "ОШИБКА - симметрическим NAT" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:627 +#, fuzzy +msgid "I2P detected that you are firewalled by a Symmetric NAT." +msgstr "I2P определила, что порт был закрыт симметрическим NAT." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:629 +#, fuzzy +msgid "I2P does not work well behind this type of firewall. You will probably not be able to accept inbound connections, which will limit your participation in the network." +msgstr "I2P не работает должным образом из-за отсутствия доступа к порту. Возможно, Вы не сможете принять входящее соединение, которое будет ограничивать доступ к сети." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:631 +#, fuzzy +msgid "ERR - UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and restart" +msgstr "ОШИБКА - UDP-порта уже используется - Настройте i2np.udp.internalPort=xxxx в advanced config и перезагрузите" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:633 +#, fuzzy +msgid "I2P was unable to bind to port 8887 or other configured port." +msgstr "I2P не мог подсоединиться к порту 8887 или к другому конфигурируемому порту." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:635 +#, fuzzy +msgid "Check to see if another program is using the configured port. If so, stop that program or configure I2P to use a different port." +msgstr "Проверьте что другая программа использует настроенный порт. Если да, то остановить программу или настроить I2P использовать другой порт." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:637 +#, fuzzy +msgid "This may be a transient error, if the other program is no longer using the port." +msgstr "Может произойти сбой, если другая программа больше не использует этот порт." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:639 +#, fuzzy +msgid "However, a restart is always required after this error." +msgstr "Однако после такой ошибки всегда требуется перезагрузка." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:641 +#, fuzzy +msgid "ERR - UDP Disabled and Inbound TCP host/port not set" +msgstr "ОШИБКА - UDP отключен и входящий TCP / порт не указан" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:643 +#, fuzzy +msgid "You have not configured inbound TCP with a hostname and port above, however you have disabled UDP." +msgstr "Вы не сконфигурировали входящий TCP с именем хоста и выше указанным портом, но все равно Вы отключили UDP." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:645 +#, fuzzy +msgid "Therefore your router cannot accept inbound connections." +msgstr "Следовательно Ваш маршрутизатор не может принять входящее соединение." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:647 +#, fuzzy +msgid "Please configure a TCP host and port above or enable UDP." +msgstr "Пожалуйста, сконфигурируйте хост TCP и выше указанный порт или же включите UDP." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:649 +#, fuzzy +msgid "ERR - Client Manager I2CP Error - check logs" +msgstr "ОШИБКА - Менеджер Клиентов I2CP Ошибка - проверьте текстовые файлы (logs)" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:651 +#, fuzzy +msgid "This is usually due to a port 7654 conflict. Check the logs to verify." +msgstr "Обычно это обусловлено конфликтом порта 7654 (ошибка). Проверьте текстовые файлы (logs), чтоб удостовериться." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:653 +#, fuzzy +msgid "Do you have another I2P instance running? Stop the conflicting program and restart I2P." +msgstr "У Вас есть другое выполнение запроса через протокол I2P? Остановите эту программу и перезагрузите I2P." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:107 +#, fuzzy +msgid "config advanced" +msgstr "расширенные настройки" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:242 +#, fuzzy +msgid "I2P Advanced Configuration" +msgstr "I2P Расширенные Настройки" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:299 +#, fuzzy +msgid "Advanced I2P Configuration" +msgstr "Расширенные I2P Настройки" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:303 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:321 +#, fuzzy +msgid "Apply" +msgstr "Применить" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:309 +#, fuzzy +msgid "Some changes may require a restart to take effect." +msgstr "Может потребоваться перезагрузка системы для того, чтобы некоторые изменения вступили в силу." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:106 +#, fuzzy +msgid "config clients" +msgstr "настройка клиента" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:241 +#, fuzzy +msgid "I2P Client Configuration" +msgstr "I2P Настройка Клиента" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:306 +#, fuzzy +msgid "Client Configuration" +msgstr "Настройка Клиента" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:308 +#, fuzzy +msgid "The Java clients listed below are started by the router and run in the same JVM." +msgstr "Java-клиенты, приведенные ниже, запускаются маршрутизатором и действуют в одной и той же Java-машине." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:312 +#, fuzzy +msgid "To change other client options, edit the file" +msgstr "Для того, чтобы изменить другие пользовательские настройки, выполните редактирование файла" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:319 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:331 +#, fuzzy +msgid "All changes require restart to take effect." +msgstr "Для того, чтобы данные изменения вступили в силу, выполните перезагрузку I2P." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:323 +#, fuzzy +msgid "WebApp Configuration" +msgstr "WebApp Конфигурация" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:325 +#, fuzzy +msgid "The Java web applications listed below are started by the webConsole client and run in the same JVM as the router. They are usually web applications accessible through the router console. They may be complete applications (e.g. i2psnark),front-ends to another client or application which must be separately enabled (e.g. susidns, i2ptunnel), or have no web interface at all (e.g. addressbook)." +msgstr "Веб-приложения Java, перечисленные ниже, запускаются при помощи консольного клиента с веб-интерфейсом и действуют в той же Java-машине, что и маршрутизатор. Обычно это веб-приложения, доступные через консоль маршрутизатора. Они могут быть полными (например, i2psnark), обеспечивающими взаимодействие с внешними клиентами или приложениями, которые должны быть запущены отдельно (например, susidns, i2ptunnel), или же такими, которые не имеют интерфейса вообще (например, addressbook)." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:327 +#, fuzzy +msgid "A web app may also be disabled by removing the .war file from the webapps directory; however the .war file and web app will reappear when you update your router to a newer version, so disabling the web app here is the preferred method." +msgstr "Веб-приложение также можно блокировать посредством удаления файла с расширением .war из папки webappsс веб-приложениями; тем не менее, файл с расширением .war и веб-приложение появятся, когда вы обновите маршрутизатор до более новой версии, так что блокировка веб-приложения является предпочтительной." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:106 +#, fuzzy +msgid "config keyring" +msgstr "конфигурация для устройств хранения данных" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:228 +#, fuzzy +msgid "I2P Keyring Configuration" +msgstr "Конфигурация I2P Для Устройств Хранения Данных" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:294 +#, fuzzy +msgid "The router keyring is used to decrypt encrypted leaseSets." +msgstr "Устройство хранения данных маршрутизатора используется для расшифровки зашифрованных наборов адресов." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:297 +#, fuzzy +msgid "The keyring may contain keys for local or remote encrypted destinations." +msgstr "На устройстве могут содержаться ключи для локальных или удаленных адресов зашифрованных назначений." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:307 +#, fuzzy +msgid "Manual Keyring Addition" +msgstr "Ручное Дополнение К Накопителю Информации" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:309 +#, fuzzy +msgid "Enter keys for encrypted remote destinations here." +msgstr "Введите ключи для зашифрованных удаленных адресов." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:312 +#, fuzzy +msgid "Keys for local destinations must be entered on the" +msgstr "Ключи для локальных адресов назначения необходимо ввести на" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:314 +#, fuzzy +msgid "I2PTunnel page" +msgstr "странице I2PTunnel" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:316 +#, fuzzy +msgid "Dest. name, hash, or full key" +msgstr "Имя адреса назначения, хэш или полный ключ" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:318 +#, fuzzy +msgid "Encryption Key" +msgstr "Криптографический ключ" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:107 +#, fuzzy +msgid "config logging" +msgstr "настройка журнала" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:242 +#, fuzzy +msgid "I2P Logging Configuration" +msgstr "I2P Настройке Журнала" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:299 +#, fuzzy +msgid "Configure I2P Logging Options" +msgstr "Опции Записи Конфигурации I2P" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:301 +#, fuzzy +msgid "Logging filename" +msgstr "Имя файла записи" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:305 +#, fuzzy +msgid "(the symbol '@' will be replaced during log rotation)" +msgstr "(символ «@» будет заменен в процессе сканирования записи)" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:307 +#, fuzzy +msgid "Log record format" +msgstr "Формат записи системного журнала" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:311 +#, fuzzy +msgid "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)" +msgstr "(используйте следующие обозначения: «d» = дата, «c» = класс, «t» = тред, «p» = приоритет, «m» = сообщение)" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:313 +#, fuzzy +msgid "Log date format" +msgstr "Формат даты записи" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:317 +#, fuzzy +msgid "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' = millisecond)" +msgstr "(«MM» = месяц, «dd» = день, «HH» = часы, «mm» = минуты, «ss» = секунды, «SSS» = миллисекунды)" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:319 +#, fuzzy +msgid "Max log file size" +msgstr "Максимальный размер файла системного журнала" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:323 +#, fuzzy +msgid "Default log level" +msgstr "Уровень записи по умолчанию" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:327 +#, fuzzy +msgid "(DEBUG and INFO are not recommended defaults, as they will drastically slow down your router)" +msgstr "(настройки DEBUG и INFO не являются рекомендованными по умолчанию, так как они значительно замедляют работу маршрутизатора)" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:329 +#, fuzzy +msgid "Log level overrides" +msgstr "Редактирование уровня записи" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:106 +#, fuzzy +msgid "config peers" +msgstr "конфигурация пиров" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:228 +#, fuzzy +msgid "I2P Peer Configuration" +msgstr "Конфигурация Пиров I2P" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:304 +#, fuzzy +msgid "Manual Peer Controls" +msgstr "Ручное Управление Пирами" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:306 +#, fuzzy +msgid "Router Hash" +msgstr "Хэш Маршрутизатора" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:310 +#, fuzzy +msgid "Manually Ban / Unban a Peer" +msgstr "ручную запретить / разрешить пиры" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:312 +#, fuzzy +msgid "Banning will prevent the participation of this peer in tunnels you create." +msgstr "Запрет предотвратит участие данного пира в созданных вами туннелях." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:324 +#, fuzzy +msgid "Bonuses may be positive or negative, and affect the peer's inclusion in Fast and High Capacity tiers. Fast peers are used for client tunnels, and High Capacity peers are used for some exploratory tunnels. Current bonuses are displayed on the" +msgstr "Дополнительные потоки могут быть как положительными и отрицательными, оказывающими влияние на вовлечение узлов сети в быстрых узлах и узлах большой мощност. Быстрые узлы используются для клиентских туннелей, а узлы большой мощности используются в некоторых типах поисковых туннелей. Текущие потоки отображены на" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:326 +#, fuzzy +msgid "profiles page" +msgstr "странице профилей" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:342 +#, fuzzy +msgid "Adjust peer bonuses" +msgstr "Настройка дополнительных потоков пиров" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:344 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:253 +#, fuzzy +msgid "Banned Peers" +msgstr "Запрещенные Пиры" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:366 +#, fuzzy +msgid "Banned IPs" +msgstr "Запрещенные IP адресы" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:106 +#, fuzzy +msgid "config service" +msgstr "конфигурация сервиса" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:228 +#, fuzzy +msgid "I2P Service Configuration" +msgstr "Конфигурация Сервиса I2P" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:284 +#, fuzzy +msgid "Shutdown the router" +msgstr "Выключить маршрутизатор" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:286 +#, fuzzy +msgid "Graceful shutdown lets the router satisfy the agreements it has already made before shutting down, but may take a few minutes." +msgstr "Постепенное выключение позволяет маршрутизатору выполнить запланированные задания до его выключения, но это займет несколько минут." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:288 +#, fuzzy +msgid "If you need to kill the router immediately, that option is available as well." +msgstr "Постепенное выключение позволяет маршрутизатору выполнить запланированные задания до его выключения, но это займет несколько минут." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:298 +#, fuzzy +msgid "If you want the router to restart itself after shutting down, you can choose one of the following." +msgstr "Если Вы хотите, чтоб маршрутизатор перезагрузился после выключения, Вы можете выбрать одно из действий." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:300 +#, fuzzy +msgid "This is useful in some situations" +msgstr "В некоторых случаях это полезно" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:302 +#, fuzzy +msgid "for example, if you changed some settings that client applications only read at startup, such as the routerconsole password or the interface it listens on." +msgstr "к примеру, если Вы поменяли некоторые настройки, которые приложения-клиенты читают только при запуске, такие как пароль консоля маршрутизатора или прослушивание интерфейса." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:304 +#, fuzzy +msgid "A graceful restart will take a few minutes (but your peers will appreciate your patience), while a hard restart does so immediately." +msgstr "Постепенное выключение будет длиться несколько минут (но твои пиры будут благодарны за твое терпение), а жесткая перезагрузка делает это незамедлительно." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:306 +#, fuzzy +msgid "After tearing down the router, it will wait 1 minute before starting back up again." +msgstr "После разбора настройки маршрутизатора, пройдет еще 1 минута до загрузки." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:316 +#, fuzzy +msgid "Systray integration" +msgstr "Система лоток интеграции" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:318 +#, fuzzy +msgid "On the windows platform, there is a small application to sit in the system tray, allowing you to view the router's status" +msgstr "На платформе Windows, есть небольшое приложение, чтобы сидеть в системном трее, что позволяет Вам просматривать статус маршрутизатора" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:320 +#, fuzzy +msgid "(later on, I2P client applications will be able to integrate their own functionality into the system tray as well)." +msgstr "(позднее, I2P приложений клиент сможет интегрировать свои функции в системном трее тоже)" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:322 +#, fuzzy +msgid "If you are on windows, you can either enable or disable that icon here." +msgstr "Если вы на Windows, вы можете включить или отключить этот значок здесь." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:328 +#, fuzzy +msgid "Run on startup" +msgstr "Запуск при старте" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:330 +#, fuzzy +msgid "You can control whether I2P is run on startup or not by selecting one of the following options" +msgstr "Вы можете управлять ли I2P запускается при запуске или не выбрать один из следующих вариантов" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:332 +#, fuzzy +msgid "I2P will install (or remove) a service accordingly." +msgstr "I2P будет установить (или удалить) услуга, соответственно." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:334 +#, fuzzy +msgid "If you prefer the command line, you can also run the " +msgstr "Если вы предпочитаете командную строку, вы можете также запустить " + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:344 +#, fuzzy +msgid "If you are running I2P as service right now, removing it will shut down your router immediately." +msgstr "Если вы используете I2P как сервис на данный момент, удалив будет закрыта маршрутизатор немедленно." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:346 +#, fuzzy +msgid "You may want to consider shutting down gracefully, as above, then running uninstall_i2p_service_winnt.bat." +msgstr "Вы можете рассмотреть вопрос о закрытии грациозно, как указано выше, затем запустить uninstall_i2p_service_winnt.bat." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:354 +#, fuzzy +msgid "Debugging" +msgstr "Отладка программы" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:360 +#, fuzzy +msgid "Launch browser on router startup?" +msgstr "Загружать браузер при запуске маршрутизатора?" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:362 +#, fuzzy +msgid "I2P's main configuration interface is this web console, so for your convenience I2P can launch a web browser on startup pointing at" +msgstr "Основной интерфейс конфигурации I2P таки веб-консоли, поэтому для вашего удобства I2P может открыть веб-браузер при запуске указывая на" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:107 +#, fuzzy +msgid "config stats" +msgstr "конфигурации статистики" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:229 +#, fuzzy +msgid "I2P Stats Configuration" +msgstr "Конфигурация Статистики I2P" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:300 +#, fuzzy +msgid "Configure I2P Stat Collection" +msgstr "Конфигурация Сбора Статистики I2P" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:302 +#, fuzzy +msgid "Enable full stats?" +msgstr "Активировать полную статистику?" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:309 +#, fuzzy +msgid "change requires restart to take effect" +msgstr "для того, чтобы изменения вступили в силу, необходима перезагрузка системы" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:311 +#, fuzzy +msgid "Stat file" +msgstr "Файл статистики" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:315 +#, fuzzy +msgid "Filter" +msgstr "Фильтр" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:317 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:326 +#, fuzzy +msgid "toggle all" +msgstr "переключить все" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:328 +#, fuzzy +msgid "Log" +msgstr "Запись" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:330 +#, fuzzy +msgid "Graph" +msgstr "Диаграмма" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:369 +#, fuzzy +msgid "Advanced filter" +msgstr "Дополнительные фильтры" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:106 +#, fuzzy +msgid "config tunnels" +msgstr "конфигурация туннеля" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:241 +#, fuzzy +msgid "I2P Tunnel Configuration" +msgstr "Конфигурация Туннеля I2P" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:305 +#, fuzzy +msgid "The default settings work for most people." +msgstr "Стандартные настройки действуют в большинстве случаев." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:309 +#, fuzzy +msgid "There is a fundamental tradeoff between anonymity and performance." +msgstr "Необходимо сделать выбор между анонимностью и производительностью." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:312 +#, fuzzy +msgid "Tunnels longer than 3 hops (for example 2 hops + 0-2 hops, 3 hops + 0-1 hops, 3 hops + 0-2 hops), or a high quantity + backup quantity, may severely reduce performance or reliability." +msgstr "Туннели, длина которых составляет более 3 хопов (например, 2 хопа + 0-2 хопа, 3 хопа + 0-1 хоп, 3 хопа + 0-2 хопа), или большое количество + резервное количество, могут значительно уменьшить производительность или надежность." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:315 +#, fuzzy +msgid "High CPU and/or high outbound bandwidth usage may result." +msgstr "Это также может привести к перегрузке ЦП и/или ухудшению пропускной способности входящего канала." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:318 +#, fuzzy +msgid "Change these settings with care, and adjust them if you have problems." +msgstr "Будьте внимательны при изменении данных настроек, урегулируйте их в том случае, если возникнут какие-либо проблемы." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:332 +#, fuzzy +msgid "Exploratory tunnel setting changes are stored in the router.config file." +msgstr "Разведочный туннель изменений параметров хранятся в файле router.config." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:335 +#, fuzzy +msgid "Client tunnel changes are temporary and are not saved." +msgstr "Клиент туннель изменения являются временными и не сохраняются." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:337 +#, fuzzy +msgid "To make permanent client tunnel changes see the" +msgstr "Для постоянных клиентов изменения туннеля см." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:339 +#, fuzzy +msgid "i2ptunnel page" +msgstr "i2ptunnel страницу" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:106 +#, fuzzy +msgid "config UI" +msgstr "конфигурации интерфейса" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:241 +#, fuzzy +msgid "I2P UI Configuration" +msgstr "I2P Настройка Пользовательского Интерфейса" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:291 +#, fuzzy +msgid "Router Console Theme" +msgstr "Тема Консоля Маршрутизатора" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:309 +#, fuzzy +msgid "Theme selection disabled for Internet Explorer, sorry." +msgstr "Выбор тем отключена для Internet Explorer, извините." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:311 +#, fuzzy +msgid "If you're not using IE, it's likely that your browser is pretending to be IE; please configure your browser (or proxy) to use a different User Agent string if you'd like to access the console themes." +msgstr "Если вы не используете IE, то, скорее всего, ваш браузер притворяется IE, пожалуйста, настроить Ваш браузер (или прокси-сервера), чтобы использовать различные User Agent String, если вы хотите получить доступ к консоли темам." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:315 +#, fuzzy +msgid "Router Console Language" +msgstr "Язык Маршрутизатора Консоля" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:319 +#, fuzzy +msgid "Please contribute to the router console translation project! Contact the developers on IRC #i2p to help." +msgstr "Пожалуйста, помогите маршрутизатор консоли проект по переводу! Свяжете с разработчиками на IRC # I2P помочь." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:106 +#, fuzzy +msgid "config update" +msgstr "обновленная конфигурация" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:228 +#, fuzzy +msgid "I2P Update Configuration" +msgstr "Обновленная Конфигурация I2P" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:300 +#, fuzzy +msgid "Check for I2P and news updates" +msgstr "Проверьте данные I2P и обновление новостей" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:302 +#, fuzzy +msgid "News & I2P Updates" +msgstr "Новости и Обновление I2P" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:306 +#, fuzzy +msgid "Update In Progress" +msgstr "Выполняется обновление" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:314 +#, fuzzy +msgid "News URL" +msgstr "Новости URL" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:318 +#, fuzzy +msgid "Refresh frequency" +msgstr "Частота обновления" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:322 +#, fuzzy +msgid "Update policy" +msgstr "Обновление конфигурации" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:326 +#, fuzzy +msgid "Update through the eepProxy?" +msgstr "Обновление через eep-Прокси?" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:330 +#, fuzzy +msgid "eepProxy host" +msgstr "eep-Прокси хост" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:334 +#, fuzzy +msgid "eepProxy port" +msgstr "eep-Прокси порт" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:338 +#, fuzzy +msgid "Update URLs" +msgstr "Обновления URL-адресы" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:342 +#, fuzzy +msgid "Trusted keys" +msgstr "Доверенные криптографические ключи" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:346 +#, fuzzy +msgid "Update with unsigned development builds?" +msgstr "Обновить беззнаковой тестовой сборкой?" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:350 +#, fuzzy +msgid "Unsigned Build URL" +msgstr "Беззнаковая тестовая сборка URL" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:354 +#, fuzzy +msgid "Save" +msgstr "Сохранить" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:117 +#, fuzzy +msgid "Page Not Found" +msgstr "Страница Не Найдена" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:243 +#, fuzzy +msgid "Sorry! You appear to be requesting a non-existent Router Console page or resource." +msgstr "Извините! Вы, как представляется, с просьбой о несуществующих Маршрутизатор консоли страницы или ресурса." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:245 +#, fuzzy +msgid "Error 404" +msgstr "Ошибка 404" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:250 +#, fuzzy +msgid "not found" +msgstr "не найдено" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:106 +#, fuzzy +msgid "graphs" +msgstr "диаграммы" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:228 +#, fuzzy +msgid "I2P Performance Graphs" +msgstr "I2P Диаграммы Производительности" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/index_jsp.java:105 +#, fuzzy +msgid "home" +msgstr "дома" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:105 +#, fuzzy +msgid "job queue" +msgstr "очереди заданий" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:227 +#, fuzzy +msgid "I2P Router Job Queue" +msgstr "Маршрутизатор I2P Очередь Заданий" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:105 +#, fuzzy +msgid "logs" +msgstr "логи" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:227 +#, fuzzy +msgid "I2P Router Logs" +msgstr "I2P Маршрутизатор Логи" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:229 +#, fuzzy +msgid "I2P Version & Running Environment" +msgstr "I2P Версии & Действуюшая Окружающей Среды" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:231 +#, fuzzy +msgid "Please include this information in bug reports" +msgstr "Пожалуйста, включите эту информацию в докладах ошибка" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:105 +#, fuzzy +msgid "network database summary" +msgstr "база данных резюме" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:227 +#, fuzzy +msgid "I2P Network Database Summary" +msgstr "I2P База Данных Резюме" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:109 +#, fuzzy +msgid "WebApp Not Found" +msgstr "Страница Не Найдена" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:231 +#, fuzzy +msgid "Web Application Not Running" +msgstr "Применение туннелей" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:233 +#, fuzzy +msgid "The requested web application is not running." +msgstr "Предложила веб-приложений не запущено." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:235 +#, fuzzy +msgid "Please visit the config clients page to start it." +msgstr "Пожалуйста, посетите страницу конфигурации клиента для его запуска." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:105 +#, fuzzy +msgid "peer connections" +msgstr "связи пиров" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:227 +#, fuzzy +msgid "I2P Network Peers" +msgstr "I2P Сеть Пиры" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:105 +#, fuzzy +msgid "peer profiles" +msgstr "профили пиров" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:227 +#, fuzzy +msgid "I2P Network Peer Profiles" +msgstr "Профили Пиров Сети I2P" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:105 +#, fuzzy +msgid "statistics" +msgstr "статистика" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:242 +#, fuzzy +msgid "I2P Router Statistics" +msgstr "I2P Маршрутизатор Статистика" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:245 +#, fuzzy, java-format +msgid "Disable {0}s Refresh" +msgstr "Откл. {0}с. Обновление" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:105 +#, fuzzy +msgid "tunnel summary" +msgstr "туннель резюме" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:227 +#, fuzzy +msgid "I2P Tunnel Summary" +msgstr "I2P Тоннеля Резюме" + +#, fuzzy +#~ msgid "Depth" +#~ msgstr "Глубина" + From aca815c4aa9796e741366aadc5e7651ca1eafc33 Mon Sep 17 00:00:00 2001 From: walking Date: Sun, 13 Dec 2009 06:38:39 +0000 Subject: [PATCH 070/127] snark rough translation (i am not a bt guy, so need review and refine) --- apps/i2psnark/locale/messages_zh.po | 651 ++++++++++++++++++++++++++++ 1 file changed, 651 insertions(+) create mode 100644 apps/i2psnark/locale/messages_zh.po diff --git a/apps/i2psnark/locale/messages_zh.po b/apps/i2psnark/locale/messages_zh.po new file mode 100644 index 000000000..cafed8fed --- /dev/null +++ b/apps/i2psnark/locale/messages_zh.po @@ -0,0 +1,651 @@ +# 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 , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: I2P i2psnark\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-10 17:41+0000\n" +"PO-Revision-Date: 2009-12-13 14:30+0800\n" +"Last-Translator: walking \n" +"Language-Team: foo \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/org/klomp/snark/SnarkManager.java:84 +#, java-format +msgid "Adding torrents in {0} minutes" +msgstr "将于{0}分钟内完成添加" + +#: ../java/src/org/klomp/snark/SnarkManager.java:241 +#, java-format +msgid "Total uploaders limit changed to {0}" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:243 +#, java-format +msgid "Minimum total uploaders limit is {0}" +msgstr "" + +#: ../java/src/org/klomp/snark/SnarkManager.java:255 +#, java-format +msgid "Up BW limit changed to {0}KBps" +msgstr "上传带宽限制改为 {0} KBps" + +#: ../java/src/org/klomp/snark/SnarkManager.java:257 +#, java-format +msgid "Minimum up bandwidth limit is {0}KBps" +msgstr "最小上传带宽限制为 {0} KBps" + +#: ../java/src/org/klomp/snark/SnarkManager.java:301 +msgid "Cannot change the I2CP settings while torrents are active" +msgstr "正在下载/上传，无法更改I2CP设置" + +#: ../java/src/org/klomp/snark/SnarkManager.java:307 +msgid "Disconnecting old I2CP destination" +msgstr "正在断开旧的I2CP目标" + +#: ../java/src/org/klomp/snark/SnarkManager.java:311 +#, java-format +msgid "I2CP settings changed to {0}" +msgstr "I2CP设置改为{0}" + +#: ../java/src/org/klomp/snark/SnarkManager.java:315 +msgid "Unable to connect with the new settings, reverting to the old I2CP settings" +msgstr "无法通过新设置连接，恢复I2CP的旧设置" + +#: ../java/src/org/klomp/snark/SnarkManager.java:319 +msgid "Unable to reconnect with the old settings!" +msgstr "旧设置也无法连接！" + +#: ../java/src/org/klomp/snark/SnarkManager.java:321 +msgid "Reconnected on the new I2CP destination" +msgstr "重新连接新I2CP目标" + +#: ../java/src/org/klomp/snark/SnarkManager.java:332 +#, java-format +msgid "I2CP listener restarted for \"{0}\"" +msgstr "\"{0}\"的I2CP监听端口已启动" + +#: ../java/src/org/klomp/snark/SnarkManager.java:343 +msgid "Enabled autostart" +msgstr "启用自动启动" + +#: ../java/src/org/klomp/snark/SnarkManager.java:345 +msgid "Disabled autostart" +msgstr "禁用自动启动" + +#: ../java/src/org/klomp/snark/SnarkManager.java:351 +msgid "Enabled open trackers - torrent restart required to take effect." +msgstr "启用OpenTracker-种子重新连接后生效" + +#: ../java/src/org/klomp/snark/SnarkManager.java:353 +msgid "Disabled open trackers - torrent restart required to take effect." +msgstr "禁用OpenTracker-种子重新连接后生效" + +#: ../java/src/org/klomp/snark/SnarkManager.java:360 +msgid "Open Tracker list changed - torrent restart required to take effect." +msgstr "OpenTracker列表改变-种子重新连接后生效" + +#: ../java/src/org/klomp/snark/SnarkManager.java:367 +msgid "Configuration unchanged." +msgstr "设置未改变" + +#: ../java/src/org/klomp/snark/SnarkManager.java:377 +#, java-format +msgid "Unable to save the config to {0}" +msgstr "无法保存设置到{0}" + +#: ../java/src/org/klomp/snark/SnarkManager.java:395 +msgid "Connecting to I2P" +msgstr "正在连接到I2P" + +#: ../java/src/org/klomp/snark/SnarkManager.java:398 +msgid "Error connecting to I2P - check your I2CP settings!" +msgstr "连接I2P时发生错误 - 请检查I2CP设置!" + +#: ../java/src/org/klomp/snark/SnarkManager.java:407 +#, java-format +msgid "Error: Could not add the torrent {0}" +msgstr "错误：无法添加种子{0}" + +#: ../java/src/org/klomp/snark/SnarkManager.java:446 +#, java-format +msgid "Torrent in \"{0}\" is invalid" +msgstr "无效种子 \"{0}\" " + +#: ../java/src/org/klomp/snark/SnarkManager.java:461 +#, java-format +msgid "Torrent added and started: \"{0}\"" +msgstr "种子已添加并启动:\"{0}\"" + +#: ../java/src/org/klomp/snark/SnarkManager.java:463 +#, java-format +msgid "Torrent added: \"{0}\"" +msgstr "种子已添加:\"{0}\"" + +#: ../java/src/org/klomp/snark/SnarkManager.java:559 +#, java-format +msgid "Non-i2p tracker in \"{0}\", deleting it from our list of trackers!" +msgstr "\"{0}\" 中含有非I2P Tracker，从Tracker列表中删除之。" + +#: ../java/src/org/klomp/snark/SnarkManager.java:562 +#, java-format +msgid "Too many files in \"{0}\" ({1}), deleting it!" +msgstr "\"{0}\" ({1}) 含有太多文件，删除之!" + +#: ../java/src/org/klomp/snark/SnarkManager.java:564 +#, java-format +msgid "Torrent file \"{0}\" cannot end in '.torrent', deleting it!" +msgstr "种子文件 \"{0}\" 不以 \".torrent\"结尾，删除之！" + +#: ../java/src/org/klomp/snark/SnarkManager.java:566 +#, java-format +msgid "No pieces in \"{0}\", deleting it!" +msgstr "\"{0}\" 中没有数据片，删除之!" + +#: ../java/src/org/klomp/snark/SnarkManager.java:568 +#, java-format +msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!" +msgstr "\"{0}\" 中文件分片太多，限额为{1}，删除之！" + +#: ../java/src/org/klomp/snark/SnarkManager.java:570 +#, java-format +msgid "Pieces are too large in \"{0}\" ({1}B), deleting it." +msgstr "\"{0}\" ({1}B) 中文件分片过大，删除之。" + +#: ../java/src/org/klomp/snark/SnarkManager.java:571 +#, java-format +msgid "Limit is {0}B" +msgstr "限额为 {0}B" + +#: ../java/src/org/klomp/snark/SnarkManager.java:579 +#, 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:595 +#, java-format +msgid "Error: Could not remove the torrent {0}" +msgstr "错误:无法删除种子{0}" + +#: ../java/src/org/klomp/snark/SnarkManager.java:616 +#, java-format +msgid "Torrent stopped: \"{0}\"" +msgstr "种子已停止:\"{0}\"" + +#: ../java/src/org/klomp/snark/SnarkManager.java:631 +#, java-format +msgid "Torrent removed: \"{0}\"" +msgstr "种子已删除:\"{0}\"" + +#: ../java/src/org/klomp/snark/SnarkManager.java:664 +#, java-format +msgid "Download finished: \"{0}\"" +msgstr "下载已完成:\"{0}\"" + +#: ../java/src/org/klomp/snark/SnarkManager.java:664 +#, java-format +msgid "size: {0}B" +msgstr "大小:{0}B" + +#: ../java/src/org/klomp/snark/SnarkManager.java:692 +msgid "Unable to connect to I2P!" +msgstr "无法连接至I2P!" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:86 +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:97 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:655 +msgid "I2PSnark" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:99 +msgid "Forum" +msgstr "论坛" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:125 +msgid "Status" +msgstr "状态" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:132 +msgid "Hide Peers" +msgstr "隐藏用户" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:134 +msgid "Show Peers" +msgstr "显示用户" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:138 +msgid "Torrent" +msgstr "种子" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:140 +msgid "ETA" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:142 +msgid "Downloaded" +msgstr "已下载" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:144 +msgid "Uploaded" +msgstr "已上传" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:146 +msgid "Down Rate" +msgstr "下载速度" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:148 +msgid "Up Rate" +msgstr "上传速度" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:155 +msgid "Stop all torrents and the I2P tunnel" +msgstr "停止全部种子及I2P隧道" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:157 +msgid "Stop All" +msgstr "停止全部" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:162 +msgid "Start all torrents and the I2P tunnel" +msgstr "启动全部种子及I2P隧道" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:164 +msgid "Start All" +msgstr "启动全部" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:181 +msgid "No torrents loaded." +msgstr "未载入任何种子" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:186 +msgid "Totals" +msgstr "总计" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:188 +#, java-format +msgid "{0} torrents" +msgstr "{0} 个种子" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:191 +#, java-format +msgid "{0} connected peers" +msgstr "{0} 已连接用户" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:218 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:748 +msgid "Add torrent" +msgstr "添加种子" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:226 +#, java-format +msgid "Torrent file {0} does not exist" +msgstr "种子文件{0}不存在" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:236 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985 +#, java-format +msgid "Torrent already running: {0}" +msgstr "种子已启动:{0}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:238 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:987 +#, java-format +msgid "Torrent already in the queue: {0}" +msgstr "种子排队中:{0}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:242 +#, java-format +msgid "Copying torrent to {0}" +msgstr "正在复制种子到{0}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:245 +#, java-format +msgid "Unable to copy the torrent to {0}" +msgstr "无法复制种子文件到{0}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:245 +#, java-format +msgid "from {0}" +msgstr "来源{0}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:253 +#, java-format +msgid "Fetching {0}" +msgstr "正在获取{0}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:257 +msgid "Invalid URL - must start with http://" +msgstr "无效链接 - 必须以http:// 开头" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:262 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 +msgid "Stop" +msgstr "停止" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:277 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:623 +msgid "Start" +msgstr "启动" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:287 +#, java-format +msgid "Starting up torrent {0}" +msgstr "正在启动种子{0}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:307 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:325 +#, java-format +msgid "Torrent file deleted: {0}" +msgstr "种子文件已删除:{0}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:331 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:341 +#, java-format +msgid "Data file deleted: {0}" +msgstr "数据文件已删除:{0}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:333 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:343 +#, java-format +msgid "Data file could not be deleted: {0}" +msgstr "无法删除数据文件:{0}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:352 +#, java-format +msgid "Data dir deleted: {0}" +msgstr "数据文件夹已删除:{0}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:359 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:913 +msgid "Save configuration" +msgstr "保存设置" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:373 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:799 +msgid "Create torrent" +msgstr "创建种子" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:383 +msgid "Error creating torrent - you must select a tracker" +msgstr "创建种子时发生错误 - 您必须选择一个Tracker" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:398 +#, java-format +msgid "Torrent created for \"{0}\"" +msgstr "种子创建成功\"{0}\"" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:401 +#, 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:403 +#, java-format +msgid "Error creating a torrent for \"{0}\"" +msgstr "创建种子时发生错误 \"{0}\"" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:406 +#, java-format +msgid "Cannot create a torrent for the nonexistent data: {0}" +msgstr "无法为不存在的数据文件创建种子:{0}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:409 +msgid "Error creating torrent - you must enter a file or directory" +msgstr "创建种子时发生错误 - 必须指定文件或文件夹" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:412 +msgid "Stopping all torrents and closing the I2P tunnel." +msgstr "正在停用所有种子并关闭I2P隧道。" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:421 +msgid "I2P tunnel closed." +msgstr "I2P隧道已关闭" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:424 +msgid "Opening the I2P tunnel and starting all torrents." +msgstr "正在打开I2P隧道并启动所有种子" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:501 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:669 +msgid "Unknown" +msgstr "未知" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:504 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512 +msgid "TrackerErr" +msgstr "Tracker错误" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:506 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:518 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:527 +#: ../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:535 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:858 +msgid "peers" +msgstr "用户" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:516 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:520 +msgid "Seeding" +msgstr "正做种" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:522 +msgid "Complete" +msgstr "完成" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:525 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:529 +msgid "OK" +msgstr "确定" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:531 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535 +msgid "Stalled" +msgstr "等待" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +msgid "No Peers" +msgstr "没有用户" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:539 +msgid "Stopped" +msgstr "已停用" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:552 +msgid "View files" +msgstr "浏览文件" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:554 +msgid "Open file" +msgstr "打开文件" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:578 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:778 +msgid "Tracker" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:579 +msgid "Details" +msgstr "详情" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:613 +msgid "Stop the torrent" +msgstr "停止种子" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:621 +msgid "Start the torrent" +msgstr "启动种子" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628 +msgid "Remove the torrent from the active list, deleting the .torrent file" +msgstr "从活动列表中删除种子，删除.torrent文件。" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630 +msgid "Remove" +msgstr "删除" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:634 +msgid "Delete the .torrent file and the associated data file(s)" +msgstr "删除.torrent文件及相应的数据文件" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:636 +msgid "Delete" +msgstr "删除" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:679 +msgid "Seed" +msgstr "种子" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:697 +msgid "Uninteresting" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:699 +msgid "Choked" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:713 +msgid "Uninterested" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:715 +msgid "Choking" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:741 +msgid "Add Torrent" +msgstr "添加种子" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:743 +msgid "From URL" +msgstr "从URL" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:751 +#, java-format +msgid "Alternately, you can copy .torrent files to {0} ." +msgstr "否则，您可以将.torrent文件复制到{0}." + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:753 +msgid "Removing a .torrent file will cause the torrent to stop." +msgstr "删除.torrent 文件将导致该种子停止连接。" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:769 +msgid "Create Torrent" +msgstr "创建种子" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:772 +msgid "Data to seed" +msgstr "做种数据" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:776 +msgid "File to seed (must be within the specified path)" +msgstr "做种文件(必须处于指定的路径中)" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:780 +msgid "Select a tracker" +msgstr "选择一个Tracker" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:793 +msgid "or" +msgstr "后" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:796 +msgid "Custom tracker URL" +msgstr "自定义TrackerURL" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:816 +msgid "Configuration" +msgstr "设置" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:819 +msgid "Data directory" +msgstr "数据文件夹" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:822 +msgid "Directory to store torrents and data" +msgstr "种子及被做种文件的保存位置。" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:824 +msgid "Edit i2psnark.config and restart to change" +msgstr "编辑 i2psnark.config 并重启Snark后生效" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:828 +msgid "Auto start" +msgstr "自动启动" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:832 +msgid "If checked, automatically start torrents that are added" +msgstr "选中后Snark将自动启动已添加的所有种子。" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:855 +msgid "Total uploader limit" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +msgid "Up bandwidth limit" +msgstr "上传带宽限制" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:865 +msgid "Half available bandwidth< recommended." +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:867 +msgid "Configure" +msgstr "设置" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:871 +msgid "Use open trackers also" +msgstr "同时使用OpenTracker" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:875 +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:879 +msgid "Open tracker announce URLs" +msgstr "Open Tracker发布链接" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:890 +msgid "I2CP host" +msgstr "I2CP主机" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:895 +msgid "I2CP port" +msgstr "I2CP端口" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:908 +msgid "I2CP options" +msgstr "I2CP选项" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:966 +#, java-format +msgid "Torrent fetched from {0}" +msgstr "从{0}获取种子成功" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:993 +#, java-format +msgid "Torrent at {0} was not valid" +msgstr "{0}的种子中有错误" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:998 +#, java-format +msgid "Torrent was not retrieved from {0}" +msgstr "从{0}获得种子失败" + From 21e09cb0a5c39048d9803e815cd6f4a821a397b9 Mon Sep 17 00:00:00 2001 From: walking Date: Sun, 13 Dec 2009 07:35:30 +0000 Subject: [PATCH 071/127] no more 8887 --- installer/resources/readme/readme_zh.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/resources/readme/readme_zh.html b/installer/resources/readme/readme_zh.html index b6f8e0261..876bbe71d 100644 --- a/installer/resources/readme/readme_zh.html +++ b/installer/resources/readme/readme_zh.html @@ -35,4 +35,4 @@

      疑难解答

      -

      保持耐心 - I2P 第一次启动时需要搜索节点，可能比较缓慢。如果30分钟后，您的活动节点计数仍在 10 个节点以下, 请在防火墙中打开 8887 端口改善连接性能。如果您根本无法打开任何EEPSITE(甚至 www.i2p2.i2p)，检查您的浏览器代理设置是否为本地的 127.0.0.1:4444。你也可以到 I2P 网站 查找信息, 在 I2P 论坛 中发帖, 来 irc.freenode.net , irc.postman.i2p 或 irc.freshcoffee.i2p 上的 #i2p 或 #i2p-chat 这两个 IRC 频道上询问。 (这些服务器上的这两个频道是相通的)。

      +

      保持耐心 - I2P 第一次启动时需要搜索节点，可能比较缓慢。如果30分钟后，您的活动节点计数仍在 10 个节点以下, 请在防火墙中打开 I2P端口(见 I2P内部设置>网络 下的IP与传输设置一节)改善连接性能。如果您根本无法打开任何EEPSITE(甚至 www.i2p2.i2p)，检查您的浏览器代理设置是否为本地的 127.0.0.1:4444。你也可以到 I2P 网站 查找信息, 在 I2P 论坛 中发帖, 来 irc.freenode.net , irc.postman.i2p 或 irc.freshcoffee.i2p 上的 #i2p 或 #i2p-chat 这两个 IRC 频道上询问。 (这些服务器上的这两个频道是相通的)。

      From e87ff25ef69dab4460fa2e9c2c9deac3a8ca56cb Mon Sep 17 00:00:00 2001 From: dev Date: Sun, 13 Dec 2009 09:24:25 +0000 Subject: [PATCH 072/127] fix NPE --- .../java/src/net/i2p/router/web/TunnelRenderer.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java index 74a585d48..71aca046c 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java @@ -306,6 +306,10 @@ public class TunnelRenderer { String lc = this.comm.getCountry(l); String rc = this.comm.getCountry(r); + // make them non-null + lc = (lc == null) ? "zzzz" : lc; + rc = (rc == null) ? "zzzz" : rc; + // let String handle the rest return lc.compareTo(rc); } From 7feed50af40c2817971ddb470b9c8db3bbd4245c Mon Sep 17 00:00:00 2001 From: dev Date: Sun, 13 Dec 2009 09:26:10 +0000 Subject: [PATCH 073/127] -5 --- history.txt | 1 + router/java/src/net/i2p/router/RouterVersion.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/history.txt b/history.txt index 907e71655..d324dcded 100644 --- a/history.txt +++ b/history.txt @@ -1,6 +1,7 @@ 2009-12-12 zzz * Disable InternalSockets until it's fixed * Sort peers on tunnels.jsp by country + * fix NPE in ^^ 2009-12-11 zzz * Addressbook, susidns: Rework addressbook into a diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index e4d51a2bb..b54d1de4b 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 4; + public final static long BUILD = 5; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; From 3fa9ae0b8206b999f957b626af19efed393acca8 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 13 Dec 2009 15:47:51 +0000 Subject: [PATCH 074/127] * Find ResourceBundles in wars * Fix restart from config.jsp if no wrapper * i2psnark: Elaborate popups --- apps/i2psnark/java/bundle-messages.sh | 2 +- .../org/klomp/snark/web/I2PSnarkServlet.java | 10 +++--- apps/routerconsole/java/bundle-messages.sh | 2 +- .../net/i2p/router/web/ConfigNetHandler.java | 36 ++++++++++--------- core/java/src/net/i2p/util/Translate.java | 5 ++- history.txt | 11 ++++-- .../src/net/i2p/router/RouterVersion.java | 2 +- 7 files changed, 38 insertions(+), 30 deletions(-) diff --git a/apps/i2psnark/java/bundle-messages.sh b/apps/i2psnark/java/bundle-messages.sh index ad8c0ab84..01aa5b1c7 100755 --- a/apps/i2psnark/java/bundle-messages.sh +++ b/apps/i2psnark/java/bundle-messages.sh @@ -73,7 +73,7 @@ do echo "Generating ${CLASS}_$LG ResourceBundle..." # convert to class files in build/obj - msgfmt --java -r $CLASS -l $LG -d build/obj $i + msgfmt --java --statistics -r $CLASS -l $LG -d build/obj $i if [ $? -ne 0 ] then echo 'Warning - msgfmt failed, not updating translations' diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index 305a9eb06..c3341229f 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -518,7 +518,7 @@ public class I2PSnarkServlet extends HttpServlet { curPeers + '/' + knownPeers + " " + _("peers") + ")"; else if (isRunning) - statusString = _("Seeding") + " (" + curPeers + "/" + knownPeers + ' ' + ("peers") + ')'; + statusString = _("Seeding") + " (" + curPeers + "/" + knownPeers + ' ' + _("peers") + ')'; else statusString = _("Complete"); } else { @@ -695,9 +695,9 @@ public class I2PSnarkServlet extends HttpServlet { } else { out.write(""); out.write(formatSize(peer.getDownloadRate()) + "ps"); } @@ -711,9 +711,9 @@ public class I2PSnarkServlet extends HttpServlet { } else { out.write(""); out.write(formatSize(peer.getUploadRate()) + "ps"); } diff --git a/apps/routerconsole/java/bundle-messages.sh b/apps/routerconsole/java/bundle-messages.sh index 33db27572..ddc6785a0 100755 --- a/apps/routerconsole/java/bundle-messages.sh +++ b/apps/routerconsole/java/bundle-messages.sh @@ -104,7 +104,7 @@ do echo "Generating ${CLASS}_$LG ResourceBundle..." # convert to class files in build/obj - msgfmt --java -r $CLASS -l $LG -d build/obj $i + msgfmt --java --statistics -r $CLASS -l $LG -d build/obj $i if [ $? -ne 0 ] then echo 'Warning - msgfmt failed, not updating translations' diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java index 373a272f0..90f02596a 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java @@ -256,24 +256,26 @@ public class ConfigNetHandler extends FormHandler { if (switchRequired) { hiddenSwitch(); } else if (restartRequired) { - // Wow this dumps all conns immediately and really isn't nice - //addFormNotice("Performing a soft restart"); - //_context.router().restart(); - //addFormNotice("Soft restart complete"); + if (System.getProperty("wrapper.version") == null) { + // Wow this dumps all conns immediately and really isn't nice + addFormNotice("Performing a soft restart"); + _context.router().restart(); + addFormNotice("Soft restart complete"); - // Most of the time we aren't changing addresses, just enabling or disabling - // things, so let's try just a new routerInfo and see how that works. - // Maybe we should restart if we change addresses though? - // No, this doesn't work well, really need to call SSU Transport externalAddressReceived(), - // but that's hard to get to, and doesn't handle port changes, etc. - // So don't do this... - //_context.router().rebuildRouterInfo(); - //addFormNotice("Router Info rebuilt"); - - // There's a few changes that don't really require restart (e.g. enabling inbound TCP) - // But it would be hard to get right, so just do a restart. - addFormError(_("Gracefully restarting I2P to change published router address")); - _context.router().shutdownGracefully(Router.EXIT_GRACEFUL_RESTART); + // Most of the time we aren't changing addresses, just enabling or disabling + // things, so let's try just a new routerInfo and see how that works. + // Maybe we should restart if we change addresses though? + // No, this doesn't work well, really need to call SSU Transport externalAddressReceived(), + // but that's hard to get to, and doesn't handle port changes, etc. + // So don't do this... + //_context.router().rebuildRouterInfo(); + //addFormNotice("Router Info rebuilt"); + } else { + // There's a few changes that don't really require restart (e.g. enabling inbound TCP) + // But it would be hard to get right, so just do a restart. + addFormError(_("Gracefully restarting I2P to change published router address")); + _context.router().shutdownGracefully(Router.EXIT_GRACEFUL_RESTART); + } } } diff --git a/core/java/src/net/i2p/util/Translate.java b/core/java/src/net/i2p/util/Translate.java index 75803968a..324b3a241 100644 --- a/core/java/src/net/i2p/util/Translate.java +++ b/core/java/src/net/i2p/util/Translate.java @@ -112,9 +112,8 @@ public abstract class Translate { ResourceBundle rv = _bundles.get(key); if (rv == null && !_missing.contains(key)) { try { - // Would it be faster to specify a class loader? - // No matter we only do this once per lang. - rv = ResourceBundle.getBundle(bun, new Locale(lang)); + // We must specify the class loader so that a webapp can find the bundle in the .war + rv = ResourceBundle.getBundle(bun, new Locale(lang), Thread.currentThread().getContextClassLoader()); if (rv != null) _bundles.put(key, rv); } catch (MissingResourceException e) { diff --git a/history.txt b/history.txt index d324dcded..9d16e53d3 100644 --- a/history.txt +++ b/history.txt @@ -1,8 +1,15 @@ -2009-12-12 zzz - * Disable InternalSockets until it's fixed +2009-12-13 zzz + * Find ResourceBundles in wars + * Fix restart from config.jsp if no wrapper + * i2psnark: Elaborate popups + +2009-12-12 welterde * Sort peers on tunnels.jsp by country * fix NPE in ^^ +2009-12-12 zzz + * Disable InternalSockets until it's fixed + 2009-12-11 zzz * Addressbook, susidns: Rework addressbook into a HttpServlet, so susidns can kick it when the subscription diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index b54d1de4b..5a4225cae 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 5; + public final static long BUILD = 6; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; From a3d79aaa4efe1b43748cf44f8513bd0e1cde5449 Mon Sep 17 00:00:00 2001 From: forget Date: Mon, 14 Dec 2009 20:15:16 +0000 Subject: [PATCH 075/127] Russian translation: I2PSnark (140/140), SusiDNS (1/1), I2PTunnel (3/3) --- apps/i2psnark/locale/messages_ru.po | 648 +++++++++++++++++++++++++++ apps/i2ptunnel/locale/messages_ru.po | 31 ++ apps/susidns/locale/messages_ru.po | 23 + 3 files changed, 702 insertions(+) create mode 100644 apps/i2psnark/locale/messages_ru.po create mode 100644 apps/i2ptunnel/locale/messages_ru.po create mode 100644 apps/susidns/locale/messages_ru.po diff --git a/apps/i2psnark/locale/messages_ru.po b/apps/i2psnark/locale/messages_ru.po new file mode 100644 index 000000000..5412300a6 --- /dev/null +++ b/apps/i2psnark/locale/messages_ru.po @@ -0,0 +1,648 @@ +# 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 , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: I2P i2psnark\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-14 03:19+0000\n" +"PO-Revision-Date: 2009-12-14 19:58+0000\n" +"Last-Translator: 4get \n" +"Language-Team: foo \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Russian\n" + +#: ../java/src/org/klomp/snark/SnarkManager.java:84 +#, java-format +msgid "Adding torrents in {0} minutes" +msgstr "Торренты будут подгружены через {0} минут(ы)" + +#: ../java/src/org/klomp/snark/SnarkManager.java:241 +#, java-format +msgid "Total uploaders limit changed to {0}" +msgstr "Новое значение лимита количества слотов отдачи: {0}" + +#: ../java/src/org/klomp/snark/SnarkManager.java:243 +#, java-format +msgid "Minimum total uploaders limit is {0}" +msgstr "Минимально допустимое значение для количества слотов: {0}" + +#: ../java/src/org/klomp/snark/SnarkManager.java:255 +#, java-format +msgid "Up BW limit changed to {0}KBps" +msgstr "Новое значение лимита скорости отдачи: {0} KBps" + +#: ../java/src/org/klomp/snark/SnarkManager.java:257 +#, java-format +msgid "Minimum up bandwidth limit is {0}KBps" +msgstr "Минимально допустимое значение для лимита скорости отдачи: {0} KBps" + +#: ../java/src/org/klomp/snark/SnarkManager.java:301 +msgid "Cannot change the I2CP settings while torrents are active" +msgstr "Невозможно изменить настройки I2CP пока есть активные торренты" + +#: ../java/src/org/klomp/snark/SnarkManager.java:307 +msgid "Disconnecting old I2CP destination" +msgstr "Рассоединяемся по старому адресу I2CP" + +#: ../java/src/org/klomp/snark/SnarkManager.java:311 +#, java-format +msgid "I2CP settings changed to {0}" +msgstr "Новые параметры I2CP: {0}" + +#: ../java/src/org/klomp/snark/SnarkManager.java:315 +msgid "Unable to connect with the new settings, reverting to the old I2CP settings" +msgstr "Не удалось соединиться с использованием новых настроек I2CP, возвращаемся к старым настройкам" + +#: ../java/src/org/klomp/snark/SnarkManager.java:319 +msgid "Unable to reconnect with the old settings!" +msgstr "Не удалось пересоединиться с использованием старых настроек I2CP!" + +#: ../java/src/org/klomp/snark/SnarkManager.java:321 +msgid "Reconnected on the new I2CP destination" +msgstr "Пересоединились по новому адресу I2CP" + +#: ../java/src/org/klomp/snark/SnarkManager.java:332 +#, java-format +msgid "I2CP listener restarted for \"{0}\"" +msgstr "I2CP-приёмник перезапущен для \"{0}\"" + +#: ../java/src/org/klomp/snark/SnarkManager.java:343 +msgid "Enabled autostart" +msgstr "Автостарт включен" + +#: ../java/src/org/klomp/snark/SnarkManager.java:345 +msgid "Disabled autostart" +msgstr "Автостарт выключен" + +#: ../java/src/org/klomp/snark/SnarkManager.java:351 +msgid "Enabled open trackers - torrent restart required to take effect." +msgstr "Включено использование открытых трекеров. Требуется перезапуск торрента, чтобы изменения вступили в силу." + +#: ../java/src/org/klomp/snark/SnarkManager.java:353 +msgid "Disabled open trackers - torrent restart required to take effect." +msgstr "Отключено использование открытых трекеров. Требуется перезапуск торрента, чтобы изменения вступили в силу." + +#: ../java/src/org/klomp/snark/SnarkManager.java:360 +msgid "Open Tracker list changed - torrent restart required to take effect." +msgstr "Изменен список открытых трекеров. Требуется перезапуск торрента, чтобы изменения вступили в силу." + +#: ../java/src/org/klomp/snark/SnarkManager.java:367 +msgid "Configuration unchanged." +msgstr "Настройки не изменились." + +#: ../java/src/org/klomp/snark/SnarkManager.java:377 +#, java-format +msgid "Unable to save the config to {0}" +msgstr "Не удалось сохранить настройки в {0}" + +#: ../java/src/org/klomp/snark/SnarkManager.java:395 +msgid "Connecting to I2P" +msgstr "Устанавливается соединение с I2P" + +#: ../java/src/org/klomp/snark/SnarkManager.java:398 +msgid "Error connecting to I2P - check your I2CP settings!" +msgstr "Ошибка соединения с I2P, проверьте настройки I2CP!" + +#: ../java/src/org/klomp/snark/SnarkManager.java:407 +#, java-format +msgid "Error: Could not add the torrent {0}" +msgstr "Ошибка: Не удалось добавить торрент {0}" + +#: ../java/src/org/klomp/snark/SnarkManager.java:446 +#, java-format +msgid "Torrent in \"{0}\" is invalid" +msgstr "Торрент в \"{0}\" некорректен" + +#: ../java/src/org/klomp/snark/SnarkManager.java:461 +#, java-format +msgid "Torrent added and started: \"{0}\"" +msgstr "Торрент добавлен и запущен: \"{0}\"" + +#: ../java/src/org/klomp/snark/SnarkManager.java:463 +#, java-format +msgid "Torrent added: \"{0}\"" +msgstr "Торрент добавлен: \"{0}\"" + +#: ../java/src/org/klomp/snark/SnarkManager.java:559 +#, java-format +msgid "Non-i2p tracker in \"{0}\", deleting it from our list of trackers!" +msgstr "Обнаружен не-I2P трекер в торренте \"{0}\", удаляем его из нашего списка трекеров!" + +#: ../java/src/org/klomp/snark/SnarkManager.java:562 +#, java-format +msgid "Too many files in \"{0}\" ({1}), deleting it!" +msgstr "Слишком много файлов в торренте \"{0}\" ({1}), удаляем его!" + +#: ../java/src/org/klomp/snark/SnarkManager.java:564 +#, java-format +msgid "Torrent file \"{0}\" cannot end in '.torrent', deleting it!" +msgstr "Торрент \"{0}\" содержит единственный файл заканчивающийся на '.torrent', удаляем его!" + +#: ../java/src/org/klomp/snark/SnarkManager.java:566 +#, java-format +msgid "No pieces in \"{0}\", deleting it!" +msgstr "В торренте \"{0}\" не оказалось ни одной части, удаляем его!" + +#: ../java/src/org/klomp/snark/SnarkManager.java:568 +#, java-format +msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!" +msgstr "Слишком много частей в торренте \"{0}\" (наш предел {1}), удаляем его!" + +#: ../java/src/org/klomp/snark/SnarkManager.java:570 +#, java-format +msgid "Pieces are too large in \"{0}\" ({1}B), deleting it." +msgstr "Слишком крупные части в торренте \"{0}\" ({1}B), удаляем его." + +#: ../java/src/org/klomp/snark/SnarkManager.java:571 +#, java-format +msgid "Limit is {0}B" +msgstr "Наш предел {0}B" + +#: ../java/src/org/klomp/snark/SnarkManager.java:579 +#, 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:595 +#, java-format +msgid "Error: Could not remove the torrent {0}" +msgstr "Ошибка: Невозможно удалить торрент {0}" + +#: ../java/src/org/klomp/snark/SnarkManager.java:616 +#, java-format +msgid "Torrent stopped: \"{0}\"" +msgstr "Торрент остановлен: \"{0}\"" + +#: ../java/src/org/klomp/snark/SnarkManager.java:631 +#, java-format +msgid "Torrent removed: \"{0}\"" +msgstr "Торрент удален: \"{0}\"" + +#: ../java/src/org/klomp/snark/SnarkManager.java:664 +#, java-format +msgid "Download finished: \"{0}\"" +msgstr "Завершена загрузка: \"{0}\"" + +#: ../java/src/org/klomp/snark/SnarkManager.java:664 +#, java-format +msgid "size: {0}B" +msgstr "размер: {0}B" + +#: ../java/src/org/klomp/snark/SnarkManager.java:692 +msgid "Unable to connect to I2P!" +msgstr "Не удалось установить соединение с I2P!" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:86 +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:97 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:656 +msgid "I2PSnark" +msgstr "I2PSnark" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:99 +msgid "Forum" +msgstr "Форум" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:125 +msgid "Status" +msgstr "Статус" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:131 +msgid "Hide Peers" +msgstr "спрятать список пиров" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:134 +msgid "Show Peers" +msgstr "показать список пиров" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:139 +msgid "Torrent" +msgstr "Торрент" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:141 +msgid "ETA" +msgstr "Осталось" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:143 +msgid "Downloaded" +msgstr "Получено" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:145 +msgid "Uploaded" +msgstr "Отдано" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:147 +msgid "Down Rate" +msgstr "Скорость загрузки" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:149 +msgid "Up Rate" +msgstr "Скорость отдачи" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:156 +msgid "Stop all torrents and the I2P tunnel" +msgstr "Остановить все торренты и закрыть соединение с I2P" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:158 +msgid "Stop All" +msgstr "Остановить все" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:163 +msgid "Start all torrents and the I2P tunnel" +msgstr "Запустить все торренты и открыть соединение с I2P" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:165 +msgid "Start All" +msgstr "Запустить все" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:182 +msgid "No torrents loaded." +msgstr "Нет загруженных торрентов." + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:187 +msgid "Totals" +msgstr "Всего" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:189 +#, java-format +msgid "{0} torrents" +msgstr "{0} торрентов" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:192 +#, java-format +msgid "{0} connected peers" +msgstr "{0} подсоединенных пиров" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:227 +#, 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:986 +#, 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:988 +#, java-format +msgid "Torrent already in the queue: {0}" +msgstr "Торрент уже в очереди: {0}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:243 +#, java-format +msgid "Copying torrent to {0}" +msgstr "Копируем торрент в: {0}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:246 +#, java-format +msgid "Unable to copy the torrent to {0}" +msgstr "Не удалось скопировать торрент в: {0}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:246 +#, java-format +msgid "from {0}" +msgstr "из: {0}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:254 +#, java-format +msgid "Fetching {0}" +msgstr "Получение торрента: {0}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:258 +msgid "Invalid URL - must start with http://" +msgstr "Некорректный URL, должен начинаться с http://" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:288 +#, 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-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-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-format +msgid "Data file could not be deleted: {0}" +msgstr "Не удалось удалить файл: {0}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:353 +#, java-format +msgid "Data dir deleted: {0}" +msgstr "Директория удалена: {0}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:384 +msgid "Error creating torrent - you must select a tracker" +msgstr "Торрент не создан — вы должны указать трекер" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:399 +#, java-format +msgid "Torrent created for \"{0}\"" +msgstr "Создан торрент для \"{0}\"" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:402 +#, 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-format +msgid "Error creating a torrent for \"{0}\"" +msgstr "Ошибка при создании торрента для: \"{0}\"" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:407 +#, java-format +msgid "Cannot create a torrent for the nonexistent data: {0}" +msgstr "Невозможно создать торрент для несуществующего файла или директории: {0}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:410 +msgid "Error creating torrent - you must enter a file or directory" +msgstr "Торрент не создан — вы должны указать файл или директорию" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:413 +msgid "Stopping all torrents and closing the I2P tunnel." +msgstr "Останавливаем все торренты и закрываем соединение с I2P" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:422 +msgid "I2P tunnel closed." +msgstr "Соединение с I2P закрыто." + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:425 +msgid "Opening the I2P tunnel and starting all torrents." +msgstr "Соединяемся с I2P и запускаем все торренты." + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:502 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:670 +msgid "Unknown" +msgstr "Неизвестный" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:505 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:513 +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:507 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:519 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:521 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:528 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:530 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:859 +msgid "peers" +msgstr "пир." + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:517 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:521 +msgid "Seeding" +msgstr "Раздается" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:523 +msgid "Complete" +msgstr "Завершен" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:526 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:530 +msgid "OK" +msgstr "Загружается" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:532 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 +msgid "Stalled" +msgstr "Простаивает" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:538 +msgid "No Peers" +msgstr "Нет Пиров" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:540 +msgid "Stopped" +msgstr "Остановлен" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:553 +msgid "View files" +msgstr "Открыть директорию" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:555 +msgid "Open file" +msgstr "Открыть файл" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:579 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:779 +msgid "Tracker" +msgstr "Трекер" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580 +msgid "Details" +msgstr "Подробнее" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614 +msgid "Stop the torrent" +msgstr "Остановить торрент" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616 +msgid "Stop" +msgstr "Остановить" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:622 +msgid "Start the torrent" +msgstr "Запустить торрент" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:624 +msgid "Start" +msgstr "Запустить" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:629 +msgid "Remove the torrent from the active list, deleting the .torrent file" +msgstr "Удалить торрент из списка и с диска" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:631 +msgid "Remove" +msgstr "Удалить" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:635 +msgid "Delete the .torrent file and the associated data file(s)" +msgstr "Удалить торрент и стереть загруженные файлы" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:637 +msgid "Delete" +msgstr "Стереть" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680 +msgid "Seed" +msgstr "Сид" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698 +msgid "Uninteresting (The peer has no pieces we need)" +msgstr "Uninteresting (У пира нет нужных нам частей)" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:700 +msgid "Choked (The peer is not allowing us to request pieces)" +msgstr "Choked (Этот пир не позволяет нам запрашивать части)" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:714 +msgid "Uninterested (We have no pieces the peer needs)" +msgstr "Uninterested (У нас нужных этому пиру частей)" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:716 +msgid "Choking (We are not allowing the peer to request pieces)" +msgstr "Choking (Мы не позволяем этому пиру запрашивать у нас части)" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:742 +msgid "Add Torrent" +msgstr "Добавить Торрент" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:744 +msgid "From URL" +msgstr "Из URL" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:749 +msgid "Add torrent" +msgstr "Добавить торрент" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:752 +#, java-format +msgid "Alternately, you can copy .torrent files to the directory {0}." +msgstr "Ну или вы можете скопировать .torrent-файлы в директорию {0}." + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:754 +msgid "Removing a .torrent file will cause the torrent to stop." +msgstr "Удаление .torrent-файла приведет к остановке торрента." + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:770 +msgid "Create Torrent" +msgstr "Создать Торрент" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:773 +msgid "Data to seed" +msgstr "Файлы для раздачи" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:777 +msgid "File or directory to seed (must be within the specified path)" +msgstr "Файл или директория для раздачи (вводите только название файла или директории, указание абсолютных путей не поддерживается)" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:781 +msgid "Select a tracker" +msgstr "Выбрать трекер" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:794 +msgid "or" +msgstr "или" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:797 +msgid "Specify custom tracker announce URL" +msgstr "Задать URL анонсера вручную" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:800 +msgid "Create torrent" +msgstr "Создать торрент" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:817 +msgid "Configuration" +msgstr "Настройки" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:820 +msgid "Data directory" +msgstr "Директория для файлов" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 +msgid "Directory to store torrents and data" +msgstr "Директория, где будут храниться торренты и загружаемые файлы" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:825 +msgid "Edit i2psnark.config and restart to change" +msgstr "Для изменения отредактируйте файл i2psnark.config и перезагрузите I2PSnark" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:829 +msgid "Auto start" +msgstr "Автозапуск" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 +msgid "If checked, automatically start torrents that are added" +msgstr "Автоматически запускать торренты после добавления" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:856 +msgid "Total uploader limit" +msgstr "Ограничение количества слотов отдачи" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:863 +msgid "Up bandwidth limit" +msgstr "Ограничение скорости отдачи" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 +msgid "Half available bandwidth recommended." +msgstr "Рекомендуется использовать половину от доступной пропускной способности." + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:868 +msgid "View or change router bandwidth" +msgstr "Посмотреть/настроить ограничения скорости в маршрутизаторе I2P" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:872 +msgid "Use open trackers also" +msgstr "Дополнительно использовать открытые трекеры" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:876 +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:880 +msgid "Open tracker announce URLs" +msgstr "URL открытых трекеров" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:891 +msgid "I2CP host" +msgstr "Адрес I2CP" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:896 +msgid "I2CP port" +msgstr "Порт I2CP" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:909 +msgid "I2CP options" +msgstr "Параметры I2CP" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:914 +msgid "Save configuration" +msgstr "Сохранить настройки" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:967 +#, java-format +msgid "Torrent fetched from {0}" +msgstr "Получен торрент из: {0}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:994 +#, java-format +msgid "Torrent at {0} was not valid" +msgstr "Торрент полученный с адреса {0} некорректен" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:999 +#, java-format +msgid "Torrent was not retrieved from {0}" +msgstr "Не удалось получить торрент из: {0}" + diff --git a/apps/i2ptunnel/locale/messages_ru.po b/apps/i2ptunnel/locale/messages_ru.po new file mode 100644 index 000000000..57770b2e2 --- /dev/null +++ b/apps/i2ptunnel/locale/messages_ru.po @@ -0,0 +1,31 @@ +# 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 , 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-12-14 11:51+0000\n" +"Last-Translator: 4get \n" +"Language-Team: foo \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Russian\n" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:73 +msgid "I2P Tunnel Manager - Edit Client Tunnel" +msgstr "Менеджер Туннелей I2P — Редактирование Клиентского Туннеля" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:73 +msgid "I2P Tunnel Manager - Edit Server Tunnel" +msgstr "Менеджер Туннелей I2P — Редактирование Серверного Туннеля" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:71 +msgid "I2P Tunnel Manager - List" +msgstr "Менеджер Туннелей I2P — Список" + diff --git a/apps/susidns/locale/messages_ru.po b/apps/susidns/locale/messages_ru.po new file mode 100644 index 000000000..0cebf4e7d --- /dev/null +++ b/apps/susidns/locale/messages_ru.po @@ -0,0 +1,23 @@ +# I2P +# Copyright (C) 2009 The I2P Project +# This file is distributed under the same license as the susidns package. +# To contribute translations, see http://www.i2p2.de/newdevelopers +# foo , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: I2P susidns\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-10 01:53+0000\n" +"PO-Revision-Date: 2009-12-14 20:01+0000\n" +"Last-Translator: 4get \n" +"Language-Team: foo \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Russian\n" + +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:88 +msgid "Introduction - SusiDNS" +msgstr "Введение - SusiDNS" + From e07e329c269f5bb1e8a0d5859133a2ce344cbfc6 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 15 Dec 2009 01:41:43 +0000 Subject: [PATCH 076/127] Tunnels: static fix, synchronization fix, deprecate setPairedTunnel() --- .../java/src/net/i2p/router/tunnel/pool/BuildRequestor.java | 2 +- .../net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java | 4 +++- .../src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java | 2 +- .../src/net/i2p/router/tunnel/pool/TunnelPoolManager.java | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java b/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java index 21325be85..3f5a2ea23 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java +++ b/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java @@ -109,7 +109,7 @@ class BuildRequestor { return; } - cfg.setPairedTunnel(pairedTunnel); + //cfg.setPairedTunnel(pairedTunnel); long beforeDispatch = System.currentTimeMillis(); if (cfg.isInbound()) { diff --git a/router/java/src/net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java b/router/java/src/net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java index 3728ebc52..b2cb7c704 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java +++ b/router/java/src/net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java @@ -83,7 +83,9 @@ public class PooledTunnelCreatorConfig extends TunnelCreatorConfig { public void setTestJob(TestJob job) { _testJob = job; } public void setExpireJob(Job job) { /* _expireJob = job; */ } - // Fix memory leaks caused by references if you need to use pairedTunnel + /** + * @deprecated Fix memory leaks caused by references if you need to use pairedTunnel + */ public void setPairedTunnel(TunnelInfo tunnel) { /* _pairedTunnel = tunnel; */} // public TunnelInfo getPairedTunnel() { return _pairedTunnel; } } diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java index 2cfac2cc4..a3b5c4b20 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java @@ -491,7 +491,7 @@ public abstract class TunnelPeerSelector { * Now: * d((H(l+h), h) - d(H(r+h), h) */ - private class HashComparator implements Comparator { + private static class HashComparator implements Comparator { private Hash _hash; private HashComparator(Hash h) { diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java index d87975035..dab276069 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java @@ -175,7 +175,7 @@ public class TunnelPoolManager implements TunnelManagerFacade { public int getOutboundClientTunnelCount() { int count = 0; List destinations = null; - synchronized (_clientInboundPools) { + synchronized (_clientOutboundPools) { destinations = new ArrayList(_clientOutboundPools.keySet()); } for (int i = 0; i < destinations.size(); i++) { From e16227211f07b34dcb21e3d936d8b4f521d5556e Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 15 Dec 2009 01:44:20 +0000 Subject: [PATCH 077/127] remove unused logs --- core/java/src/net/i2p/data/i2cp/AbuseReason.java | 4 +--- core/java/src/net/i2p/data/i2cp/AbuseSeverity.java | 4 +--- core/java/src/net/i2p/data/i2cp/BandwidthLimitsMessage.java | 2 -- core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java | 4 +--- core/java/src/net/i2p/data/i2cp/CreateSessionMessage.java | 4 +--- core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java | 4 +--- core/java/src/net/i2p/data/i2cp/DisconnectMessage.java | 4 +--- .../src/net/i2p/data/i2cp/GetBandwidthLimitsMessage.java | 3 --- core/java/src/net/i2p/data/i2cp/GetDateMessage.java | 5 +---- core/java/src/net/i2p/data/i2cp/I2CPMessageException.java | 4 +--- core/java/src/net/i2p/data/i2cp/I2CPMessageHandler.java | 2 -- core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java | 4 +--- core/java/src/net/i2p/data/i2cp/MessageId.java | 4 +--- core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java | 2 -- core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java | 4 +--- .../src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java | 4 +--- .../java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java | 4 +--- .../src/net/i2p/data/i2cp/ReconfigureSessionMessage.java | 2 -- core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java | 4 +--- core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java | 2 -- .../src/net/i2p/data/i2cp/SendMessageExpiresMessage.java | 2 -- core/java/src/net/i2p/data/i2cp/SendMessageMessage.java | 4 +--- core/java/src/net/i2p/data/i2cp/SessionId.java | 5 +---- core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java | 4 +--- core/java/src/net/i2p/data/i2cp/SetDateMessage.java | 4 +--- 25 files changed, 18 insertions(+), 71 deletions(-) diff --git a/core/java/src/net/i2p/data/i2cp/AbuseReason.java b/core/java/src/net/i2p/data/i2cp/AbuseReason.java index db69fedd9..58c23d5e8 100644 --- a/core/java/src/net/i2p/data/i2cp/AbuseReason.java +++ b/core/java/src/net/i2p/data/i2cp/AbuseReason.java @@ -16,7 +16,6 @@ import java.io.OutputStream; import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; import net.i2p.data.DataStructureImpl; -import net.i2p.util.Log; /** * Defines the structure for why abuse was reported either by the client to @@ -25,7 +24,6 @@ import net.i2p.util.Log; * @author jrandom */ public class AbuseReason extends DataStructureImpl { - private final static Log _log = new Log(AbuseReason.class); private String _reason; public AbuseReason() { @@ -64,4 +62,4 @@ public class AbuseReason extends DataStructureImpl { public String toString() { return "[AbuseReason: " + getReason() + "]"; } -} \ No newline at end of file +} diff --git a/core/java/src/net/i2p/data/i2cp/AbuseSeverity.java b/core/java/src/net/i2p/data/i2cp/AbuseSeverity.java index 2f9140e08..0bdc4805c 100644 --- a/core/java/src/net/i2p/data/i2cp/AbuseSeverity.java +++ b/core/java/src/net/i2p/data/i2cp/AbuseSeverity.java @@ -16,7 +16,6 @@ import java.io.OutputStream; import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; import net.i2p.data.DataStructureImpl; -import net.i2p.util.Log; /** * Provides a severity level (larger numbers are more severe) in association with @@ -26,7 +25,6 @@ import net.i2p.util.Log; * @author jrandom */ public class AbuseSeverity extends DataStructureImpl { - private final static Log _log = new Log(AbuseSeverity.class); private int _severityId; public AbuseSeverity() { @@ -65,4 +63,4 @@ public class AbuseSeverity extends DataStructureImpl { public String toString() { return "[AbuseSeverity: " + getSeverity() + "]"; } -} \ No newline at end of file +} diff --git a/core/java/src/net/i2p/data/i2cp/BandwidthLimitsMessage.java b/core/java/src/net/i2p/data/i2cp/BandwidthLimitsMessage.java index 02308c7b4..bd8a2ff0e 100644 --- a/core/java/src/net/i2p/data/i2cp/BandwidthLimitsMessage.java +++ b/core/java/src/net/i2p/data/i2cp/BandwidthLimitsMessage.java @@ -11,7 +11,6 @@ import java.io.InputStream; import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; -import net.i2p.util.Log; /** * Tell the other side the limits @@ -19,7 +18,6 @@ import net.i2p.util.Log; * @author zzz */ public class BandwidthLimitsMessage extends I2CPMessageImpl { - private final static Log _log = new Log(BandwidthLimitsMessage.class); public final static int MESSAGE_TYPE = 23; private static final int LIMITS = 16; private int[] data; diff --git a/core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java b/core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java index 75818f483..cf6759a26 100644 --- a/core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java +++ b/core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java @@ -18,7 +18,6 @@ import net.i2p.data.DataHelper; import net.i2p.data.LeaseSet; import net.i2p.data.PrivateKey; import net.i2p.data.SigningPrivateKey; -import net.i2p.util.Log; /** * Defines the message a client sends to a router when authorizing @@ -27,7 +26,6 @@ import net.i2p.util.Log; * @author jrandom */ public class CreateLeaseSetMessage extends I2CPMessageImpl { - private final static Log _log = new Log(CreateLeaseSetMessage.class); public final static int MESSAGE_TYPE = 4; private SessionId _sessionId; private LeaseSet _leaseSet; @@ -138,4 +136,4 @@ public class CreateLeaseSetMessage extends I2CPMessageImpl { buf.append("]"); return buf.toString(); } -} \ No newline at end of file +} diff --git a/core/java/src/net/i2p/data/i2cp/CreateSessionMessage.java b/core/java/src/net/i2p/data/i2cp/CreateSessionMessage.java index 1de5dfdbd..1b8004ce0 100644 --- a/core/java/src/net/i2p/data/i2cp/CreateSessionMessage.java +++ b/core/java/src/net/i2p/data/i2cp/CreateSessionMessage.java @@ -15,7 +15,6 @@ import java.io.InputStream; import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; -import net.i2p.util.Log; /** * Defines the message a client sends to a router when establishing a new @@ -24,7 +23,6 @@ import net.i2p.util.Log; * @author jrandom */ public class CreateSessionMessage extends I2CPMessageImpl { - private final static Log _log = new Log(CreateSessionMessage.class); public final static int MESSAGE_TYPE = 1; private SessionConfig _sessionConfig; @@ -91,4 +89,4 @@ public class CreateSessionMessage extends I2CPMessageImpl { buf.append("]"); return buf.toString(); } -} \ No newline at end of file +} diff --git a/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java b/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java index 3cd535afe..630e0e718 100644 --- a/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java +++ b/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java @@ -15,7 +15,6 @@ import java.io.InputStream; import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; -import net.i2p.util.Log; /** * Defines the message a client sends to a router when destroying @@ -24,7 +23,6 @@ import net.i2p.util.Log; * @author jrandom */ public class DestroySessionMessage extends I2CPMessageImpl { - private final static Log _log = new Log(DestroySessionMessage.class); public final static int MESSAGE_TYPE = 3; private SessionId _sessionId; @@ -93,4 +91,4 @@ public class DestroySessionMessage extends I2CPMessageImpl { buf.append("]"); return buf.toString(); } -} \ No newline at end of file +} diff --git a/core/java/src/net/i2p/data/i2cp/DisconnectMessage.java b/core/java/src/net/i2p/data/i2cp/DisconnectMessage.java index 08f08f5e6..f9c32810d 100644 --- a/core/java/src/net/i2p/data/i2cp/DisconnectMessage.java +++ b/core/java/src/net/i2p/data/i2cp/DisconnectMessage.java @@ -15,7 +15,6 @@ import java.io.InputStream; import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; -import net.i2p.util.Log; /** * Defines the message a client sends to a router when destroying @@ -24,7 +23,6 @@ import net.i2p.util.Log; * @author jrandom */ public class DisconnectMessage extends I2CPMessageImpl { - private final static Log _log = new Log(DisconnectMessage.class); public final static int MESSAGE_TYPE = 30; private String _reason; @@ -83,4 +81,4 @@ public class DisconnectMessage extends I2CPMessageImpl { buf.append("]"); return buf.toString(); } -} \ No newline at end of file +} diff --git a/core/java/src/net/i2p/data/i2cp/GetBandwidthLimitsMessage.java b/core/java/src/net/i2p/data/i2cp/GetBandwidthLimitsMessage.java index 64a89824d..35f44b522 100644 --- a/core/java/src/net/i2p/data/i2cp/GetBandwidthLimitsMessage.java +++ b/core/java/src/net/i2p/data/i2cp/GetBandwidthLimitsMessage.java @@ -8,15 +8,12 @@ package net.i2p.data.i2cp; import java.io.IOException; import java.io.InputStream; -import net.i2p.util.Log; - /** * Request the router tells us the current bw limits * * @author zzz */ public class GetBandwidthLimitsMessage extends I2CPMessageImpl { - private final static Log _log = new Log(GetBandwidthLimitsMessage.class); public final static int MESSAGE_TYPE = 8; public GetBandwidthLimitsMessage() { diff --git a/core/java/src/net/i2p/data/i2cp/GetDateMessage.java b/core/java/src/net/i2p/data/i2cp/GetDateMessage.java index 76ee1a58f..f36ec02d9 100644 --- a/core/java/src/net/i2p/data/i2cp/GetDateMessage.java +++ b/core/java/src/net/i2p/data/i2cp/GetDateMessage.java @@ -12,14 +12,11 @@ package net.i2p.data.i2cp; import java.io.IOException; import java.io.InputStream; -import net.i2p.util.Log; - /** * Request the other side to send us what they think the current time is * */ public class GetDateMessage extends I2CPMessageImpl { - private final static Log _log = new Log(GetDateMessage.class); public final static int MESSAGE_TYPE = 32; public GetDateMessage() { @@ -57,4 +54,4 @@ public class GetDateMessage extends I2CPMessageImpl { buf.append("[GetDateMessage]"); return buf.toString(); } -} \ No newline at end of file +} diff --git a/core/java/src/net/i2p/data/i2cp/I2CPMessageException.java b/core/java/src/net/i2p/data/i2cp/I2CPMessageException.java index b49028731..63d13b040 100644 --- a/core/java/src/net/i2p/data/i2cp/I2CPMessageException.java +++ b/core/java/src/net/i2p/data/i2cp/I2CPMessageException.java @@ -10,7 +10,6 @@ package net.i2p.data.i2cp; */ import net.i2p.I2PException; -import net.i2p.util.Log; /** * Represent an error serializing or deserializing an APIMessage @@ -18,7 +17,6 @@ import net.i2p.util.Log; * @author jrandom */ public class I2CPMessageException extends I2PException { - private final static Log _log = new Log(I2CPMessageException.class); public I2CPMessageException(String message, Throwable parent) { super(message, parent); @@ -27,4 +25,4 @@ public class I2CPMessageException extends I2PException { public I2CPMessageException(String message) { super(message); } -} \ No newline at end of file +} diff --git a/core/java/src/net/i2p/data/i2cp/I2CPMessageHandler.java b/core/java/src/net/i2p/data/i2cp/I2CPMessageHandler.java index 04da546f7..739f7823e 100644 --- a/core/java/src/net/i2p/data/i2cp/I2CPMessageHandler.java +++ b/core/java/src/net/i2p/data/i2cp/I2CPMessageHandler.java @@ -15,14 +15,12 @@ import java.io.InputStream; import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; -import net.i2p.util.Log; /** * Handle messages from the server for the client or vice versa * */ public class I2CPMessageHandler { - private final static Log _log = new Log(I2CPMessageHandler.class); /** * Read an I2CPMessage from the stream and return the fully populated object. diff --git a/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java b/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java index af86863d2..3ace5df9d 100644 --- a/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java +++ b/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java @@ -16,7 +16,6 @@ import java.io.OutputStream; import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; import net.i2p.data.DataStructureImpl; -import net.i2p.util.Log; /** * Defines the base message implementation. @@ -24,7 +23,6 @@ import net.i2p.util.Log; * @author jrandom */ public abstract class I2CPMessageImpl extends DataStructureImpl implements I2CPMessage { - private final static Log _log = new Log(I2CPMessageImpl.class); public I2CPMessageImpl() { // nop } @@ -129,4 +127,4 @@ public abstract class I2CPMessageImpl extends DataStructureImpl implements I2CPM throw new DataFormatException("Error writing the message", ime); } } -} \ No newline at end of file +} diff --git a/core/java/src/net/i2p/data/i2cp/MessageId.java b/core/java/src/net/i2p/data/i2cp/MessageId.java index d31d478f1..84bfa0dfe 100644 --- a/core/java/src/net/i2p/data/i2cp/MessageId.java +++ b/core/java/src/net/i2p/data/i2cp/MessageId.java @@ -16,7 +16,6 @@ import java.io.OutputStream; import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; import net.i2p.data.DataStructureImpl; -import net.i2p.util.Log; /** * Defines the message ID of a message delivered between a router and a client @@ -25,7 +24,6 @@ import net.i2p.util.Log; * @author jrandom */ public class MessageId extends DataStructureImpl { - private final static Log _log = new Log(MessageId.class); private long _messageId; public MessageId() { @@ -67,4 +65,4 @@ public class MessageId extends DataStructureImpl { public String toString() { return "[MessageId: " + getMessageId() + "]"; } -} \ No newline at end of file +} diff --git a/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java b/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java index 37b7828f9..fd0327d1c 100644 --- a/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java +++ b/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java @@ -16,7 +16,6 @@ import java.io.OutputStream; import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; import net.i2p.data.Payload; -import net.i2p.util.Log; /** * Defines the payload message a router sends to the client @@ -24,7 +23,6 @@ import net.i2p.util.Log; * @author jrandom */ public class MessagePayloadMessage extends I2CPMessageImpl { - private final static Log _log = new Log(MessagePayloadMessage.class); public final static int MESSAGE_TYPE = 31; private long _sessionId; private long _messageId; diff --git a/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java b/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java index 54ecad07c..b246aadb4 100644 --- a/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java +++ b/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java @@ -15,7 +15,6 @@ import java.io.OutputStream; import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; -import net.i2p.util.Log; /** * Defines the message a client sends to a router when destroying @@ -24,7 +23,6 @@ import net.i2p.util.Log; * @author jrandom */ public class MessageStatusMessage extends I2CPMessageImpl { - private final static Log _log = new Log(SessionStatusMessage.class); public final static int MESSAGE_TYPE = 22; private long _sessionId; private long _messageId; @@ -179,4 +177,4 @@ public class MessageStatusMessage extends I2CPMessageImpl { buf.append("]"); return buf.toString(); } -} \ No newline at end of file +} diff --git a/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java b/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java index 1b3a41655..8c6e0b2f1 100644 --- a/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java +++ b/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java @@ -15,7 +15,6 @@ import java.io.OutputStream; import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; -import net.i2p.util.Log; /** * Defines the message a client sends to a router when asking the @@ -24,7 +23,6 @@ import net.i2p.util.Log; * @author jrandom */ public class ReceiveMessageBeginMessage extends I2CPMessageImpl { - private final static Log _log = new Log(ReceiveMessageBeginMessage.class); public final static int MESSAGE_TYPE = 6; private long _sessionId; private long _messageId; @@ -110,4 +108,4 @@ public class ReceiveMessageBeginMessage extends I2CPMessageImpl { buf.append("]"); return buf.toString(); } -} \ No newline at end of file +} diff --git a/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java b/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java index 0ca0253e5..cf1325cc8 100644 --- a/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java +++ b/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java @@ -14,7 +14,6 @@ import java.io.InputStream; import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; -import net.i2p.util.Log; /** * Defines the message a client sends to a router when asking the @@ -23,7 +22,6 @@ import net.i2p.util.Log; * @author jrandom */ public class ReceiveMessageEndMessage extends I2CPMessageImpl { - private final static Log _log = new Log(ReceiveMessageEndMessage.class); public final static int MESSAGE_TYPE = 7; private long _sessionId; private long _messageId; @@ -94,4 +92,4 @@ public class ReceiveMessageEndMessage extends I2CPMessageImpl { buf.append("]"); return buf.toString(); } -} \ No newline at end of file +} diff --git a/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java b/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java index 5b5ad638c..5f7314d64 100644 --- a/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java +++ b/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java @@ -15,7 +15,6 @@ import java.io.InputStream; import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; -import net.i2p.util.Log; /** * Defines the message a client sends to a router when @@ -24,7 +23,6 @@ import net.i2p.util.Log; * @author zzz */ public class ReconfigureSessionMessage extends I2CPMessageImpl { - private final static Log _log = new Log(ReconfigureSessionMessage.class); public final static int MESSAGE_TYPE = 2; private SessionId _sessionId; private SessionConfig _sessionConfig; diff --git a/core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java b/core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java index fd11ec142..54b90292e 100644 --- a/core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java +++ b/core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java @@ -15,7 +15,6 @@ import java.io.InputStream; import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; -import net.i2p.util.Log; /** * Defines the message a client sends to a router when asking the @@ -24,7 +23,6 @@ import net.i2p.util.Log; * @author jrandom */ public class ReportAbuseMessage extends I2CPMessageImpl { - private final static Log _log = new Log(ReportAbuseMessage.class); public final static int MESSAGE_TYPE = 29; private SessionId _sessionId; private AbuseSeverity _severity; @@ -133,4 +131,4 @@ public class ReportAbuseMessage extends I2CPMessageImpl { buf.append("]"); return buf.toString(); } -} \ No newline at end of file +} diff --git a/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java b/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java index 46f62d264..e4db066cb 100644 --- a/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java +++ b/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java @@ -20,7 +20,6 @@ import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.TunnelId; -import net.i2p.util.Log; /** * Defines the message a client sends to a router when destroying @@ -29,7 +28,6 @@ import net.i2p.util.Log; * @author jrandom */ public class RequestLeaseSetMessage extends I2CPMessageImpl { - private final static Log _log = new Log(RequestLeaseSetMessage.class); public final static int MESSAGE_TYPE = 21; private SessionId _sessionId; private List _endpoints; diff --git a/core/java/src/net/i2p/data/i2cp/SendMessageExpiresMessage.java b/core/java/src/net/i2p/data/i2cp/SendMessageExpiresMessage.java index 81271b150..770a6777b 100644 --- a/core/java/src/net/i2p/data/i2cp/SendMessageExpiresMessage.java +++ b/core/java/src/net/i2p/data/i2cp/SendMessageExpiresMessage.java @@ -18,7 +18,6 @@ import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.data.Payload; -import net.i2p.util.Log; /** * Same as SendMessageMessage, but with an expiration to be passed to the router @@ -26,7 +25,6 @@ import net.i2p.util.Log; * @author zzz */ public class SendMessageExpiresMessage extends SendMessageMessage { - private final static Log _log = new Log(SendMessageExpiresMessage.class); /* FIXME hides another field FIXME */ public final static int MESSAGE_TYPE = 36; private SessionId _sessionId; diff --git a/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java b/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java index 9abd7f426..237306f0d 100644 --- a/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java +++ b/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java @@ -17,7 +17,6 @@ import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.data.Payload; -import net.i2p.util.Log; /** * Defines the message a client sends to a router to ask it to deliver @@ -26,7 +25,6 @@ import net.i2p.util.Log; * @author jrandom */ public class SendMessageMessage extends I2CPMessageImpl { - private final static Log _log = new Log(SendMessageMessage.class); public final static int MESSAGE_TYPE = 5; private SessionId _sessionId; private Destination _destination; @@ -159,4 +157,4 @@ public class SendMessageMessage extends I2CPMessageImpl { buf.append("]"); return buf.toString(); } -} \ No newline at end of file +} diff --git a/core/java/src/net/i2p/data/i2cp/SessionId.java b/core/java/src/net/i2p/data/i2cp/SessionId.java index d4c75ea5f..f79589c42 100644 --- a/core/java/src/net/i2p/data/i2cp/SessionId.java +++ b/core/java/src/net/i2p/data/i2cp/SessionId.java @@ -1,5 +1,4 @@ package net.i2p.data.i2cp; - /* * free (adj.): unencumbered; not under the control of others * Written by jrandom in 2003 and released into the public domain @@ -16,7 +15,6 @@ import java.io.OutputStream; import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; import net.i2p.data.DataStructureImpl; -import net.i2p.util.Log; /** * Defines the token passed between the router and client to associate messages @@ -25,7 +23,6 @@ import net.i2p.util.Log; * @author jrandom */ public class SessionId extends DataStructureImpl { - private final static Log _log = new Log(SessionId.class); private int _sessionId; public SessionId() { @@ -64,4 +61,4 @@ public class SessionId extends DataStructureImpl { public String toString() { return "[SessionId: " + getSessionId() + "]"; } -} \ No newline at end of file +} diff --git a/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java b/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java index d3775db0f..490e7e426 100644 --- a/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java +++ b/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java @@ -15,7 +15,6 @@ import java.io.InputStream; import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; -import net.i2p.util.Log; /** * Defines the message a client sends to a router when destroying @@ -24,7 +23,6 @@ import net.i2p.util.Log; * @author jrandom */ public class SessionStatusMessage extends I2CPMessageImpl { - private final static Log _log = new Log(SessionStatusMessage.class); public final static int MESSAGE_TYPE = 20; private SessionId _sessionId; private int _status; @@ -104,4 +102,4 @@ public class SessionStatusMessage extends I2CPMessageImpl { buf.append("]"); return buf.toString(); } -} \ No newline at end of file +} diff --git a/core/java/src/net/i2p/data/i2cp/SetDateMessage.java b/core/java/src/net/i2p/data/i2cp/SetDateMessage.java index ff308c5d0..f0abce1a5 100644 --- a/core/java/src/net/i2p/data/i2cp/SetDateMessage.java +++ b/core/java/src/net/i2p/data/i2cp/SetDateMessage.java @@ -17,14 +17,12 @@ import java.util.Date; import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; import net.i2p.util.Clock; -import net.i2p.util.Log; /** * Tell the other side what time it is * */ public class SetDateMessage extends I2CPMessageImpl { - private final static Log _log = new Log(SetDateMessage.class); public final static int MESSAGE_TYPE = 33; private Date _date; @@ -86,4 +84,4 @@ public class SetDateMessage extends I2CPMessageImpl { buf.append("]"); return buf.toString(); } -} \ No newline at end of file +} From 448ff4d398069dd8ba98dadad51f11aea2801395 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 15 Dec 2009 01:45:15 +0000 Subject: [PATCH 078/127] better error msg on sud copy fail --- core/java/src/net/i2p/crypto/TrustedUpdate.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/java/src/net/i2p/crypto/TrustedUpdate.java b/core/java/src/net/i2p/crypto/TrustedUpdate.java index 4d8376c13..8729f128f 100644 --- a/core/java/src/net/i2p/crypto/TrustedUpdate.java +++ b/core/java/src/net/i2p/crypto/TrustedUpdate.java @@ -452,7 +452,8 @@ D8usM7Dxp5yrDrCYZ5AIijc= while ( (bytesRead = fileInputStream.read(buffer)) != -1) fileOutputStream.write(buffer, 0, bytesRead); } catch (IOException ioe) { - return "I/O Exception during file extraction"; + // probably permissions or disk full, so bring the message out to the console + return "Error copying update: " + ioe; } finally { if (fileInputStream != null) try { From ea36b7b153335a512397a924bb71de6815c3760f Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 15 Dec 2009 01:46:10 +0000 Subject: [PATCH 079/127] susidns UTF-8 fixes --- apps/susidns/src/bundle-messages.sh | 2 +- apps/susidns/src/jsp/addressbook.jsp | 2 ++ apps/susidns/src/jsp/config.jsp | 2 ++ apps/susidns/src/jsp/index.jsp | 2 ++ apps/susidns/src/jsp/subscriptions.jsp | 2 ++ 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/susidns/src/bundle-messages.sh b/apps/susidns/src/bundle-messages.sh index e21706e88..e46eccd73 100755 --- a/apps/susidns/src/bundle-messages.sh +++ b/apps/susidns/src/bundle-messages.sh @@ -75,7 +75,7 @@ do echo "Generating ${CLASS}_$LG ResourceBundle..." # convert to class files in build/obj - msgfmt --java -r $CLASS -l $LG -d WEB-INF/classes $i + msgfmt --java --statistics -r $CLASS -l $LG -d WEB-INF/classes $i if [ $? -ne 0 ] then echo 'Warning - msgfmt failed, not updating translations' diff --git a/apps/susidns/src/jsp/addressbook.jsp b/apps/susidns/src/jsp/addressbook.jsp index 2bcf298ed..d9ff34695 100644 --- a/apps/susidns/src/jsp/addressbook.jsp +++ b/apps/susidns/src/jsp/addressbook.jsp @@ -23,6 +23,7 @@ * $Revision: 1.3 $ */ %> +<%@page pageEncoding="UTF-8"%> <%@ page contentType="text/html"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> @@ -35,6 +36,7 @@ + ${book.book} addressbook - susidns v${version.version} diff --git a/apps/susidns/src/jsp/config.jsp b/apps/susidns/src/jsp/config.jsp index fd755300c..415bec755 100644 --- a/apps/susidns/src/jsp/config.jsp +++ b/apps/susidns/src/jsp/config.jsp @@ -23,6 +23,7 @@ * $Revision: 1.1 $ */ %> +<%@page pageEncoding="UTF-8"%> <%@ page contentType="text/html" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> @@ -31,6 +32,7 @@ + configuration - susidns v${version.version} diff --git a/apps/susidns/src/jsp/index.jsp b/apps/susidns/src/jsp/index.jsp index 795dd7373..581b638f9 100644 --- a/apps/susidns/src/jsp/index.jsp +++ b/apps/susidns/src/jsp/index.jsp @@ -23,6 +23,7 @@ * $Revision: 1.2 $ */ %> +<%@page pageEncoding="UTF-8"%> <%@ page contentType="text/html"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> @@ -30,6 +31,7 @@ + <%=intl._("Introduction - SusiDNS")%> v${version.version} diff --git a/apps/susidns/src/jsp/subscriptions.jsp b/apps/susidns/src/jsp/subscriptions.jsp index 75542d57d..a60710310 100644 --- a/apps/susidns/src/jsp/subscriptions.jsp +++ b/apps/susidns/src/jsp/subscriptions.jsp @@ -23,6 +23,7 @@ * $Revision: 1.2 $ */ %> +<%@page pageEncoding="UTF-8"%> <%@ page contentType="text/html"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> @@ -31,6 +32,7 @@ + subscriptions - susidns v${version.version} From 43f68136096c0c800e0ba1a2e0029e4d090a5a06 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 15 Dec 2009 01:47:24 +0000 Subject: [PATCH 080/127] snark start/stop fix, action cleanups --- .../org/klomp/snark/web/I2PSnarkServlet.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index c3341229f..2fbf10462 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -185,7 +185,7 @@ public class I2PSnarkServlet extends HttpServlet { out.write("      \n" + "
      " + _("Peer") + "" + _("Expl. + Client") + "" + _("% of total") + "" + _("Part. from + to") + "" + _("% of total") + "
      "); out.write(_("Totals")); - out.write(" {"); + out.write(" ("); out.write(_("{0} torrents", snarks.size())); out.write(", "); out.write(DataHelper.formatSize(stats[5]) + "B, "); @@ -216,7 +216,7 @@ public class I2PSnarkServlet extends HttpServlet { String action = req.getParameter("action"); if (action == null) { // noop - } else if (_("Add torrent").equals(action)) { + } else if ("Add".equals(action)) { String newFile = req.getParameter("newFile"); String newURL = req.getParameter("newURL"); // NOTE - newFile currently disabled in HTML form - see below @@ -260,7 +260,7 @@ public class I2PSnarkServlet extends HttpServlet { } else { // no file or URL specified } - } else if (_("Stop").equals(action)) { + } else if ("Stop".equals(action)) { String torrent = req.getParameter("torrent"); if (torrent != null) { byte infoHash[] = Base64.decode(torrent); @@ -275,7 +275,7 @@ public class I2PSnarkServlet extends HttpServlet { } } } - } else if (_("Start").equals(action)) { + } else if ("Start".equals(action)) { String torrent = req.getParameter("torrent"); if (torrent != null) { byte infoHash[] = Base64.decode(torrent); @@ -357,7 +357,7 @@ public class I2PSnarkServlet extends HttpServlet { } } } - } else if (_("Save configuration").equals(action)) { + } else if ("Save".equals(action)) { String dataDir = req.getParameter("dataDir"); boolean autoStart = req.getParameter("autoStart") != null; String seedPct = req.getParameter("seedPct"); @@ -371,7 +371,7 @@ public class I2PSnarkServlet extends HttpServlet { 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); - } else if (_("Create torrent").equals(action)) { + } else if ("Create".equals(action)) { String baseData = req.getParameter("baseFile"); if (baseData != null && baseData.trim().length() > 0) { File baseFile = new File(_manager.getDataDir(), baseData); @@ -738,6 +738,7 @@ public class I2PSnarkServlet extends HttpServlet { // *not* enctype="multipart/form-data", so that the input type=file sends the filename, not the file out.write("
      \n"); out.write("\n"); + out.write("\n"); out.write("
      "); out.write(_("Add Torrent")); out.write("
      \n
      "); @@ -747,7 +748,7 @@ public class I2PSnarkServlet extends HttpServlet { //out.write("From file:
      \n"); out.write("
       
      \n"); + out.write("\" name=\"foo\" >
      \n"); out.write("
       "); out.write(_("Alternately, you can copy .torrent files to the directory {0}.", _manager.getDataDir().getAbsolutePath())); out.write("\n"); @@ -766,6 +767,7 @@ public class I2PSnarkServlet extends HttpServlet { // *not* enctype="multipart/form-data", so that the input type=file sends the filename, not the file out.write("\n"); out.write("\n"); + out.write("\n"); out.write(""); out.write(_("Create Torrent")); out.write("
      \n
      "); @@ -798,7 +800,7 @@ public class I2PSnarkServlet extends HttpServlet { out.write("\" > "); out.write("
       
      \n"); + out.write("\" name=\"foo\" >
      \n"); out.write("\n
      "); } @@ -813,6 +815,7 @@ public class I2PSnarkServlet extends HttpServlet { out.write("
      \n"); out.write("
      \n"); out.write("\n"); + out.write("\n"); out.write(""); out.write(_("Configuration")); out.write("
      \n"); @@ -912,7 +915,7 @@ public class I2PSnarkServlet extends HttpServlet { out.write("
       \n"); + out.write("\" name=\"foo\" >\n"); out.write("
      \n"); out.write("

      "); } @@ -970,6 +973,7 @@ private static class FetchAndAdd implements Runnable { in = new FileInputStream(file); MetaInfo info = new MetaInfo(in); String name = info.getName(); + name = DataHelper.stripHTML(name); // XSS name = name.replace('/', '_'); name = name.replace('\\', '_'); name = name.replace('&', '+'); From eb23306b12f458de17530df508b64693a46b6e74 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 15 Dec 2009 01:48:57 +0000 Subject: [PATCH 081/127] configurable jump list --- .../i2p/i2ptunnel/I2PTunnelHTTPClient.java | 43 +++++++++++-------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java index df0d75019..42fb39549 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java @@ -261,6 +261,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable public static final String PROP_REFERER = "i2ptunnel.httpclient.sendReferer"; public static final String PROP_USER_AGENT = "i2ptunnel.httpclient.sendUserAgent"; public static final String PROP_VIA = "i2ptunnel.httpclient.sendVia"; + public static final String PROP_JUMP_SERVERS = "i2ptunnel.httpclient.jumpServers"; private static long __requestId = 0; protected void clientConnectionRun(Socket s) { @@ -591,7 +592,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable if (_log.shouldLog(Log.WARN)) _log.warn("Unable to resolve " + destination + " (proxy? " + usingWWWProxy + ", request: " + targetRequest); byte[] header; - boolean showAddrHelper = false; + String jumpServers = null; if (usingWWWProxy) header = getErrorPage("dnfp", ERR_DESTINATION_UNKNOWN); else if(ahelper != 0) @@ -600,9 +601,11 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable header = getErrorPage("dnf", ERR_DESTINATION_UNKNOWN); else { header = getErrorPage("dnfh", ERR_DESTINATION_UNKNOWN); - showAddrHelper = true; + jumpServers = getTunnel().getClientOptions().getProperty(PROP_JUMP_SERVERS); + if (jumpServers == null) + jumpServers = DEFAULT_JUMP_SERVERS; } - writeErrorMessage(header, out, targetRequest, usingWWWProxy, destination, showAddrHelper); + writeErrorMessage(header, out, targetRequest, usingWWWProxy, destination, jumpServers); s.close(); return; } @@ -757,15 +760,16 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable } } - private static String jumpServers[] = { - "http://i2host.i2p/cgi-bin/i2hostjump?", - // "http://orion.i2p/jump/", - "http://stats.i2p/cgi-bin/jump.cgi?a=", - // "http://trevorreznik.i2p/cgi-bin/jump.php?hostname=", - "http://i2jump.i2p/" - }; + private static String DEFAULT_JUMP_SERVERS = + "http://i2host.i2p/cgi-bin/i2hostjump?," + + "http://stats.i2p/cgi-bin/jump.cgi?a=," + + "http://i2jump.i2p/"; + + /** + * @param jumpServers comma- or space-separated list, or null + */ private static void writeErrorMessage(byte[] errMessage, OutputStream out, String targetRequest, - boolean usingWWWProxy, String wwwProxy, boolean showAddrHelper) throws IOException { + boolean usingWWWProxy, String wwwProxy, String jumpServers) throws IOException { if (out != null) { out.write(errMessage); if (targetRequest != null) { @@ -781,12 +785,17 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable out.write(uri.getBytes()); out.write("".getBytes()); if (usingWWWProxy) out.write(("
      WWW proxy: " + wwwProxy).getBytes()); - if (showAddrHelper) { + if (jumpServers != null && jumpServers.length() > 0) { // Fixme untranslated out.write("

      Click a link below to look for an address helper by using a \"jump\" service:
      ".getBytes()); - for (int i = 0; i < jumpServers.length; i++) { + + StringTokenizer tok = new StringTokenizer(jumpServers, ", "); + while (tok.hasMoreTokens()) { + String jurl = tok.nextToken(); + if (!jurl.startsWith("http://")) + continue; // Skip jump servers we don't know - String jumphost = jumpServers[i].substring(7); // "http://" + String jumphost = jurl.substring(7); // "http://" jumphost = jumphost.substring(0, jumphost.indexOf('/')); try { Destination dest = I2PTunnel.destFromName(jumphost); @@ -796,10 +805,10 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable } out.write("
      ".getBytes()); - out.write(jumpServers[i].getBytes()); + out.write(jurl.getBytes()); out.write(uri.getBytes()); out.write("".getBytes()); } @@ -823,7 +832,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable header = getErrorPage(I2PAppContext.getGlobalContext(), "dnfp", ERR_DESTINATION_UNKNOWN); else header = getErrorPage(I2PAppContext.getGlobalContext(), "dnf", ERR_DESTINATION_UNKNOWN); - writeErrorMessage(header, out, targetRequest, usingWWWProxy, wwwProxy, false); + writeErrorMessage(header, out, targetRequest, usingWWWProxy, wwwProxy, null); } catch (IOException ioe) { // static //_log.warn(getPrefix(requestId) + "Error writing out the 'destination was unknown' " + "message", ioe); From cec75fa60e8bcaecfd0c5a928cb27052a4b6903c Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 15 Dec 2009 01:51:56 +0000 Subject: [PATCH 082/127] fix i2ptunnel bundles --- apps/i2ptunnel/java/build.xml | 4 +--- apps/i2ptunnel/java/bundle-messages.sh | 2 +- .../java/src/net/i2p/i2ptunnel/web/Messages.java | 2 +- history.txt | 8 ++++++++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml index fa3e5d677..9647fa8d1 100644 --- a/apps/i2ptunnel/java/build.xml +++ b/apps/i2ptunnel/java/build.xml @@ -41,10 +41,8 @@ - - - + diff --git a/apps/i2ptunnel/java/bundle-messages.sh b/apps/i2ptunnel/java/bundle-messages.sh index aa98a3167..a7e44226b 100755 --- a/apps/i2ptunnel/java/bundle-messages.sh +++ b/apps/i2ptunnel/java/bundle-messages.sh @@ -76,7 +76,7 @@ do echo "Generating ${CLASS}_$LG ResourceBundle..." # convert to class files in build/obj - msgfmt --java -r $CLASS -l $LG -d build/obj $i + msgfmt --java --statistics -r $CLASS -l $LG -d ../jsp/WEB-INF/classes $i if [ $? -ne 0 ] then echo 'Warning - msgfmt failed, not updating translations' diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/Messages.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/Messages.java index fa3839232..591d6a98c 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/Messages.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/Messages.java @@ -7,7 +7,7 @@ import net.i2p.util.Translate; * Translate strings for this package. */ public class Messages { - private static final String BUNDLE_NAME = "net.i2p.i2ptunnel.messages"; + private static final String BUNDLE_NAME = "net.i2p.i2ptunnel.web.messages"; private final I2PAppContext _context; public Messages() { diff --git a/history.txt b/history.txt index 9d16e53d3..edb571f71 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,11 @@ +2009-12-15 zzz + * HTTP Proxy: Make jump server list configurable + * i2psnark: Fix stop/start, cleanups + * i2ptunnel: Fix bundle location + * susidns: UTF-8 fixes + * TunnelManager: Fix a locking bug + * Update: Improve error message + 2009-12-13 zzz * Find ResourceBundles in wars * Fix restart from config.jsp if no wrapper diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 5a4225cae..aea509c4d 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 6; + public final static long BUILD = 7; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; From 7b1caac9ace001eec4897041e8efc7808625db0d Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 15 Dec 2009 17:25:01 +0000 Subject: [PATCH 083/127] cleanup and tag susidns jsps --- apps/susidns/src/jsp/addressbook.jsp | 48 +++++----- apps/susidns/src/jsp/config.jsp | 87 ++++++++++++------- apps/susidns/src/jsp/index.jsp | 52 +++++------ apps/susidns/src/jsp/subscriptions.jsp | 32 +++---- .../src/net/i2p/router/RouterVersion.java | 2 +- 5 files changed, 127 insertions(+), 94 deletions(-) diff --git a/apps/susidns/src/jsp/addressbook.jsp b/apps/susidns/src/jsp/addressbook.jsp index d9ff34695..4fda75eff 100644 --- a/apps/susidns/src/jsp/addressbook.jsp +++ b/apps/susidns/src/jsp/addressbook.jsp @@ -28,6 +28,7 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> + @@ -37,7 +38,7 @@ -${book.book} addressbook - susidns v${version.version} +${book.book} <%=intl._("addressbook")%> - susidns v${version.version} @@ -47,19 +48,20 @@
      -

      ${book.book} addressbook at ${book.fileName}

      +

      <%=intl._(book.getBook())%> <%=intl._("addressbook")%>: ${book.fileName}

      ${book.messages}
      @@ -68,7 +70,7 @@
      -

      Filter: +

      <%=intl._("Filter")%>: a b c @@ -96,10 +98,10 @@ y z 0-9 -all

      +<%=intl._("all")%>

      -

      Current filter: ${book.filter} -(clear filter)

      +

      <%=intl._("Current filter")%>: ${book.filter} +(<%=intl._("clear filter")%>)
      @@ -108,7 +110,7 @@
    		•   NameDestination<%=intl._("Name")%><%=intl._("Destination")%>
    "> ${addr.name} - -(addrhlpr) +(<%=intl._("address helper link")%>)
    - +
    <%=intl._("Search")%>: " >

    @@ -155,7 +155,7 @@
    -

    +

    " >

    @@ -174,7 +174,7 @@ <%=intl._("Hostname")%>: <%=intl._("Destination")%>:

    - +" >

    diff --git a/apps/susidns/src/jsp/config.jsp b/apps/susidns/src/jsp/config.jsp index 4c3cefbdf..9f407ced9 100644 --- a/apps/susidns/src/jsp/config.jsp +++ b/apps/susidns/src/jsp/config.jsp @@ -34,7 +34,7 @@ -<%=intl._("configuration")%> - susidns v${version.version} +<%=intl._("configuration")%> - susidns @@ -64,8 +64,8 @@
    - - +" > +" >
    diff --git a/apps/susidns/src/jsp/index.jsp b/apps/susidns/src/jsp/index.jsp index 0f56bdf18..51e0517e9 100644 --- a/apps/susidns/src/jsp/index.jsp +++ b/apps/susidns/src/jsp/index.jsp @@ -32,7 +32,7 @@ -<%=intl._("Introduction")%> - SusiDNS v${version.version} +<%=intl._("Introduction")%> - SusiDNS diff --git a/apps/susidns/src/jsp/subscriptions.jsp b/apps/susidns/src/jsp/subscriptions.jsp index 7485e10bc..4edd704ae 100644 --- a/apps/susidns/src/jsp/subscriptions.jsp +++ b/apps/susidns/src/jsp/subscriptions.jsp @@ -34,7 +34,7 @@ -<%=intl._("subscriptions")%> - susidns v${version.version} +<%=intl._("subscriptions")%> - susidns @@ -64,8 +64,8 @@
    - - +" > +" >
    From b53031685063a034d612a58d0affed481b438be9 Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 17 Dec 2009 01:05:29 +0000 Subject: [PATCH 088/127] * I2CP: - Move client-side writes to their own thread - Reenable InternalSockets --- .../net/i2p/client/ClientWriterRunner.java | 97 +++++++++++++++++++ .../src/net/i2p/client/I2PSessionImpl.java | 42 +++----- .../src/net/i2p/client/I2PSimpleSession.java | 1 + .../net/i2p/util/InternalServerSocket.java | 5 + .../java/src/net/i2p/util/InternalSocket.java | 10 +- 5 files changed, 123 insertions(+), 32 deletions(-) create mode 100644 core/java/src/net/i2p/client/ClientWriterRunner.java diff --git a/core/java/src/net/i2p/client/ClientWriterRunner.java b/core/java/src/net/i2p/client/ClientWriterRunner.java new file mode 100644 index 000000000..056208fb5 --- /dev/null +++ b/core/java/src/net/i2p/client/ClientWriterRunner.java @@ -0,0 +1,97 @@ +package net.i2p.client; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.LinkedBlockingQueue; + +import net.i2p.data.i2cp.I2CPMessage; +import net.i2p.data.i2cp.I2CPMessageImpl; +import net.i2p.data.i2cp.I2CPMessageException; +import net.i2p.util.I2PAppThread; + +/** + * Copied from net.i2p.router.client + * We need a single thread that writes so we don't have issues with + * the Piped Streams used in InternalSocket. + * + * @author zzz from net.i2p.router.client.ClientWriterRunner + */ +class ClientWriterRunner implements Runnable { + private OutputStream _out; + private I2PSessionImpl _session; + private BlockingQueue _messagesToWrite; + private static volatile long __Id = 0; + + /** starts the thread too */ + public ClientWriterRunner(OutputStream out, I2PSessionImpl session) { + _out = out; + _session = session; + _messagesToWrite = new LinkedBlockingQueue(); + Thread t = new I2PAppThread(this, "I2CP Client Writer " + (++__Id), true); + t.start(); + } + + /** + * Add this message to the writer's queue + * + */ + public void addMessage(I2CPMessage msg) { + try { + _messagesToWrite.put(msg); + } catch (InterruptedException ie) {} + } + + /** + * No more messages - dont even try to send what we have + * + */ + public void stopWriting() { + _messagesToWrite.clear(); + try { + _messagesToWrite.put(new PoisonMessage()); + } catch (InterruptedException ie) {} + } + + public void run() { + I2CPMessage msg; + while (!_session.isClosed()) { + try { + msg = _messagesToWrite.take(); + } catch (InterruptedException ie) { + continue; + } + if (msg.getType() == PoisonMessage.MESSAGE_TYPE) + break; + // only thread, we don't need synchronized + try { + msg.writeMessage(_out); + _out.flush(); + } catch (I2CPMessageException ime) { + _session.propogateError("Error writing out the message", ime); + _session.disconnect(); + break; + } catch (IOException ioe) { + _session.propogateError("Error writing out the message", ioe); + _session.disconnect(); + break; + } + } + _messagesToWrite.clear(); + } + + /** + * End-of-stream msg used to stop the concurrent queue + * See http://java.sun.com/j2se/1.5.0/docs/api/java/util/concurrent/BlockingQueue.html + * + */ + private static class PoisonMessage extends I2CPMessageImpl { + public static final int MESSAGE_TYPE = 999999; + public int getType() { + return MESSAGE_TYPE; + } + public void doReadMessage(InputStream buf, int size) throws I2CPMessageException, IOException {} + public byte[] doWriteMessage() throws I2CPMessageException, IOException { return null; } + } +} diff --git a/core/java/src/net/i2p/client/I2PSessionImpl.java b/core/java/src/net/i2p/client/I2PSessionImpl.java index c11c71549..b1fc2b226 100644 --- a/core/java/src/net/i2p/client/I2PSessionImpl.java +++ b/core/java/src/net/i2p/client/I2PSessionImpl.java @@ -73,6 +73,8 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa protected Socket _socket; /** reader that always searches for messages */ protected I2CPMessageReader _reader; + /** writer message queue */ + protected ClientWriterRunner _writer; /** where we pipe our messages */ protected /* FIXME final FIXME */OutputStream _out; @@ -277,11 +279,11 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa _out.write(I2PClient.PROTOCOL_BYTE); _out.flush(); } + _writer = new ClientWriterRunner(_out, this); InputStream in = _socket.getInputStream(); _reader = new I2CPMessageReader(in, this); if (_log.shouldLog(Log.DEBUG)) _log.debug(getPrefix() + "before startReading"); _reader.startReading(); - if (_log.shouldLog(Log.DEBUG)) _log.debug(getPrefix() + "Before getDate"); sendMessage(new GetDateMessage()); if (_log.shouldLog(Log.DEBUG)) _log.debug(getPrefix() + "After getDate / begin waiting for a response"); @@ -543,34 +545,14 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa * @throws I2PSessionException if the message is malformed or there is an error writing it out */ void sendMessage(I2CPMessage message) throws I2PSessionException { - if (isClosed()) throw new I2PSessionException("Already closed"); - - long beforeSync = _context.clock().now(); - long inSync = 0; - if (_log.shouldLog(Log.DEBUG)) _log.debug("before sync to write"); - try { - synchronized (_out) { - inSync = _context.clock().now(); - if (_log.shouldLog(Log.DEBUG)) _log.debug("before writeMessage"); - message.writeMessage(_out); - if (_log.shouldLog(Log.DEBUG)) _log.debug("after writeMessage"); - _out.flush(); - if (_log.shouldLog(Log.DEBUG)) _log.debug("after flush"); - } - } catch (I2CPMessageException ime) { - throw new I2PSessionException(getPrefix() + "Error writing out the message", ime); - } catch (IOException ioe) { - throw new I2PSessionException(getPrefix() + "Error writing out the message", ioe); - } - long afterSync = _context.clock().now(); - if (_log.shouldLog(Log.DEBUG)) - _log.debug(getPrefix() + "Message written out and flushed w/ " - + (inSync-beforeSync) + "ms to sync and " - + (afterSync-inSync) + "ms to send"); + if (isClosed() || _writer == null) + throw new I2PSessionException("Already closed"); + _writer.addMessage(message); } /** * Pass off the error to the listener + * Misspelled, oh well. */ void propogateError(String msg, Throwable error) { if (_log.shouldLog(Log.ERROR)) @@ -629,8 +611,14 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa private void closeSocket() { if (_log.shouldLog(Log.INFO)) _log.info(getPrefix() + "Closing the socket", new Exception("closeSocket")); _closed = true; - if (_reader != null) _reader.stopReading(); - _reader = null; + if (_reader != null) { + _reader.stopReading(); + _reader = null; + } + if (_writer != null) { + _writer.stopWriting(); + _writer = null; + } if (_socket != null) { try { diff --git a/core/java/src/net/i2p/client/I2PSimpleSession.java b/core/java/src/net/i2p/client/I2PSimpleSession.java index 933a9578c..af5ab9a75 100644 --- a/core/java/src/net/i2p/client/I2PSimpleSession.java +++ b/core/java/src/net/i2p/client/I2PSimpleSession.java @@ -79,6 +79,7 @@ class I2PSimpleSession extends I2PSessionImpl2 { _out.write(I2PClient.PROTOCOL_BYTE); _out.flush(); } + _writer = new ClientWriterRunner(_out, this); InputStream in = _socket.getInputStream(); _reader = new I2CPMessageReader(in, this); _reader.startReading(); diff --git a/core/java/src/net/i2p/util/InternalServerSocket.java b/core/java/src/net/i2p/util/InternalServerSocket.java index 00d8352ee..bc9a19ff7 100644 --- a/core/java/src/net/i2p/util/InternalServerSocket.java +++ b/core/java/src/net/i2p/util/InternalServerSocket.java @@ -21,6 +21,11 @@ import net.i2p.I2PAppContext; * A simple in-JVM ServerSocket using Piped Streams. * We use port numbers just like regular sockets. * Can only be connected by InternalSocket. + * + * Warning - this uses Piped Streams, which don't like multiple writers from threads + * that may vanish. If you do use multipe writers, + * you may get intermittent 'write end dead' or 'pipe broken' IOExceptions on the reader side. + * See http://techtavern.wordpress.com/2008/07/16/whats-this-ioexception-write-end-dead/ */ public class InternalServerSocket extends ServerSocket { private static final ConcurrentHashMap _sockets = new ConcurrentHashMap(4); diff --git a/core/java/src/net/i2p/util/InternalSocket.java b/core/java/src/net/i2p/util/InternalSocket.java index 52b028c11..26280f254 100644 --- a/core/java/src/net/i2p/util/InternalSocket.java +++ b/core/java/src/net/i2p/util/InternalSocket.java @@ -34,12 +34,12 @@ public class InternalSocket extends Socket { * Convenience method to return either a Socket or an InternalSocket */ public static Socket getSocket(String host, int port) throws IOException { - //if (System.getProperty("router.version") != null && - // (host.equals("127.0.0.1") || host.equals("localhost"))) { - // return new InternalSocket(port); - //} else { + if (System.getProperty("router.version") != null && + (host.equals("127.0.0.1") || host.equals("localhost"))) { + return new InternalSocket(port); + } else { return new Socket(host, port); - //} + } } @Override From 7ca8e0c3a125f0677d992c102ad2a44cc6f0b15d Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 17 Dec 2009 14:02:02 +0000 Subject: [PATCH 089/127] fix spacing in update section --- .../java/src/net/i2p/router/web/SummaryBarRenderer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java index 8643a9c0c..23f297031 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java @@ -176,7 +176,7 @@ public class SummaryBarRenderer { if (_helper.updateAvailable() || _helper.unsignedUpdateAvailable()) { // display all the time so we display the final failure message - buf.append("
    ").append(UpdateHandler.getStatus()); + buf.append(UpdateHandler.getStatus()); if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress"))) { // nothing } else if( @@ -191,7 +191,7 @@ public class SummaryBarRenderer { System.setProperty("net.i2p.router.web.UpdateHandler.noncePrev", prev); System.setProperty("net.i2p.router.web.UpdateHandler.nonce", nonce+""); String uri = _helper.getRequestURI(); - buf.append("
    \n"); + buf.append("

    \n"); buf.append("\n"); if (_helper.updateAvailable()) { buf.append("

    \n"); } From 8e656427d8de41be361407a919ecd429d3ad36c6 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 19 Dec 2009 16:47:18 +0000 Subject: [PATCH 099/127] * Console: - Fix status to show a disconnected network error rather than clock skew or UDP error when disconnected - Use peer clock skew rather than clock offset for determining whether to display clock skew error, i.e. display what matters * Transport: Rework peer clock skew method to always return a value by falling back to router clock offset; Fix possible AIOOBE and divide by zero; remove logging; reduce min number of peers --- .../src/net/i2p/router/web/SummaryHelper.java | 19 +++++++++++--- .../transport/CommSystemFacadeImpl.java | 26 +++++++------------ 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java index 1fc6c31b7..516855e2d 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java @@ -62,6 +62,9 @@ public class SummaryHelper extends HelperBase { return DataHelper.formatDuration(router.getUptime()); } +/** + this displayed offset, not skew - now handled in reachability() + private String timeSkew() { if (_context == null) return ""; //if (!_context.clock().getUpdatedSuccessfully()) @@ -72,6 +75,7 @@ public class SummaryHelper extends HelperBase { return ""; return " (" + DataHelper.formatDuration(diff) + " " + _("skew") + ")"; } +**/ public boolean allowReseed() { return _context.netDb().isInitialized() && @@ -83,15 +87,20 @@ public class SummaryHelper extends HelperBase { public int getAllPeers() { return Math.max(_context.netDb().getKnownRouters() - 1, 0); } public String getReachability() { - return reachability() + timeSkew(); + return reachability(); // + timeSkew(); } private String reachability() { if (_context.router().getUptime() > 60*1000 && (!_context.router().gracefulShutdownInProgress()) && !_context.clientManager().isAlive()) return _("ERR-Client Manager I2CP Error - check logs"); // not a router problem but the user should know - if (!_context.clock().getUpdatedSuccessfully()) - return _("ERR-ClockSkew"); + // Warn based on actual skew from peers, not update status, so if we successfully offset + // the clock, we don't complain. + //if (!_context.clock().getUpdatedSuccessfully()) + Long skew = _context.commSystem().getFramedAveragePeerClockSkew(33); + // Display the actual skew, not the offset + if (skew != null && Math.abs(skew.longValue()) > 45) + return _("ERR-Clock Skew of {0}", DataHelper.formatDuration(Math.abs(skew.longValue()) * 1000)); if (_context.router().isHidden()) return _("Hidden"); @@ -118,7 +127,9 @@ public class SummaryHelper extends HelperBase { default: ra = _context.router().getRouterInfo().getTargetAddress("SSU"); if (ra == null && _context.router().getUptime() > 5*60*1000) { - if (_context.getProperty(ConfigNetHelper.PROP_I2NP_NTCP_HOSTNAME) == null || + if (getActivePeers() <= 0) + return _("ERR-No Active Peers, Check Network Connection and Firewall"); + else if (_context.getProperty(ConfigNetHelper.PROP_I2NP_NTCP_HOSTNAME) == null || _context.getProperty(ConfigNetHelper.PROP_I2NP_NTCP_PORT) == null) return _("ERR-UDP Disabled and Inbound TCP host/port not set"); else diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java index 6a7eaca84..f1460b9f7 100644 --- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java +++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java @@ -77,31 +77,26 @@ public class CommSystemFacadeImpl extends CommSystemFacade { public boolean haveHighOutboundCapacity() { return (_manager == null ? false : _manager.haveHighOutboundCapacity()); } /** - * Framed average clock skew of connected peers in seconds, or null if we cannot answer. + * Framed average clock skew of connected peers in seconds, or the clock offset if we cannot answer. * Average is calculated over the middle "percentToInclude" peers. */ @Override public Long getFramedAveragePeerClockSkew(int percentToInclude) { if (_manager == null) { - if (_log.shouldLog(Log.INFO)) - _log.info("Returning null for framed averege peer clock skew (no transport manager)!"); - return null; + // round toward zero + return Long.valueOf(_context.clock().getOffset() / 1000); } Vector skews = _manager.getClockSkews(); if (skews == null) { - if (_log.shouldLog(Log.ERROR)) - _log.error("Returning null for framed average peer clock skew (no data)!"); - return null; + return Long.valueOf(_context.clock().getOffset() / 1000); } - if (skews.size() < 20) { - if (_log.shouldLog(Log.WARN)) - _log.warn("Returning null for framed average peer clock skew (only " + skews.size() + " peers)!"); - return null; + if (skews.size() < 5) { + return Long.valueOf(_context.clock().getOffset() / 1000); } // Going to calculate, sort them Collections.sort(skews); // Calculate frame size - int frameSize = (skews.size() * percentToInclude / 100); + int frameSize = Math.min((skews.size() * percentToInclude / 100), 2); int first = (skews.size() / 2) - (frameSize / 2); int last = (skews.size() / 2) + (frameSize / 2); // Sum skew values @@ -112,11 +107,8 @@ public class CommSystemFacadeImpl extends CommSystemFacade { _log.debug("Adding clock skew " + i + " valued " + value + " s."); sum = sum + value; } - // Calculate average - Long framedAverageClockSkew = new Long(sum / frameSize); - if (_log.shouldLog(Log.INFO)) - _log.info("Our framed average peer clock skew is " + framedAverageClockSkew + " s."); - return framedAverageClockSkew; + // Calculate average (round toward zero) + return Long.valueOf(sum / frameSize); } public List getBids(OutNetMessage msg) { From 4baff9fbab70965e7cdb397e1d09cb0fcafed2d4 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 19 Dec 2009 16:49:55 +0000 Subject: [PATCH 100/127] * Router: Move some more threads to I2PAppThread so an OOM won't crash the router --- router/java/src/net/i2p/router/Router.java | 13 ++++++------- .../net/i2p/router/networkdb/reseed/Reseeder.java | 6 ++++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java index 7e231097b..4ed70a772 100644 --- a/router/java/src/net/i2p/router/Router.java +++ b/router/java/src/net/i2p/router/Router.java @@ -41,6 +41,7 @@ import net.i2p.stat.Rate; import net.i2p.stat.RateStat; import net.i2p.stat.StatManager; import net.i2p.util.FileUtil; +import net.i2p.util.I2PAppThread; import net.i2p.util.I2PThread; import net.i2p.util.Log; import net.i2p.util.SimpleScheduler; @@ -201,6 +202,8 @@ public class Router { installUpdates(); // Apps may use this as an easy way to determine if they are in the router JVM + // But context.isRouterContext() is even easier... + // Both of these as of 0.7.9 System.setProperty("router.version", RouterVersion.VERSION); // NOW we start all the activity @@ -228,14 +231,10 @@ public class Router { } }; _shutdownHook = new ShutdownHook(_context); - _gracefulShutdownDetector = new I2PThread(new GracefulShutdown()); - _gracefulShutdownDetector.setDaemon(true); - _gracefulShutdownDetector.setName("Graceful shutdown hook"); + _gracefulShutdownDetector = new I2PAppThread(new GracefulShutdown(), "Graceful shutdown hook", true); _gracefulShutdownDetector.start(); - I2PThread watchdog = new I2PThread(new RouterWatchdog(_context)); - watchdog.setName("RouterWatchdog"); - watchdog.setDaemon(true); + Thread watchdog = new I2PAppThread(new RouterWatchdog(_context), "RouterWatchdog", true); watchdog.start(); } @@ -339,7 +338,7 @@ public class Router { long waited = System.currentTimeMillis() - before; if (_log.shouldLog(Log.INFO)) _log.info("Waited " + waited + "ms to initialize"); - + _context.jobQueue().addJob(new StartupJob(_context)); } diff --git a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java index f37f01aa2..2e93cb3e0 100644 --- a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java +++ b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java @@ -15,7 +15,7 @@ import java.util.StringTokenizer; import net.i2p.I2PAppContext; import net.i2p.router.RouterContext; import net.i2p.util.EepGet; -import net.i2p.util.I2PThread; +import net.i2p.util.I2PAppThread; import net.i2p.util.Log; /** @@ -52,13 +52,15 @@ public class Reseeder { return; } else { System.setProperty(PROP_INPROGRESS, "true"); - I2PThread reseed = new I2PThread(_reseedRunner, "Reseed"); + // set to daemon so it doesn't hang a shutdown + Thread reseed = new I2PAppThread(_reseedRunner, "Reseed", true); reseed.start(); } } } + /** Todo: translate the messages sent via PROP_STATUS */ public class ReseedRunner implements Runnable, EepGet.StatusListener { private boolean _isRunning; From f0d444b32eea1ef45ce9d0dab4791834091281fa Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 19 Dec 2009 16:52:18 +0000 Subject: [PATCH 101/127] add to javadoc and adjust logging --- .../i2p/router/tunnel/FragmentHandler.java | 73 +++++++++++++++++-- 1 file changed, 65 insertions(+), 8 deletions(-) diff --git a/router/java/src/net/i2p/router/tunnel/FragmentHandler.java b/router/java/src/net/i2p/router/tunnel/FragmentHandler.java index 43e1d1314..57e44203e 100644 --- a/router/java/src/net/i2p/router/tunnel/FragmentHandler.java +++ b/router/java/src/net/i2p/router/tunnel/FragmentHandler.java @@ -21,6 +21,65 @@ import net.i2p.util.SimpleTimer; * Handle fragments at the endpoint of a tunnel, peeling off fully completed * I2NPMessages when they arrive, and dropping fragments if they take too long * to arrive. + * + * From tunnel-alt.html: + +

    When the gateway wants to deliver data through the tunnel, it first +gathers zero or more I2NP messages, selects how much padding will be used, +fragments it across the necessary number of 1KB tunnel messages, and decides how +each I2NP message should be handled by the tunnel endpoint, encoding that +data into the raw tunnel payload:

    +
      +
    • the first 4 bytes of the SHA256 of the remaining preprocessed data concatenated + with the IV, using the IV as will be seen on the tunnel endpoint (for + outbound tunnels) or the IV as was seen on the tunnel gateway (for inbound + tunnels) (see below for IV processing).
      • +
    • 0 or more bytes containing random nonzero integers
      • +
    • 1 byte containing 0x00
      • +
    • a series of zero or more { instructions, message } pairs
      • +
    + +

    The instructions are encoded with a single control byte, followed by any +necessary additional information. The first bit in that control byte determines +how the remainder of the header is interpreted - if it is not set, the message +is either not fragmented or this is the first fragment in the message. If it is +set, this is a follow on fragment.

    + +

    With the first bit being 0, the instructions are:

    +
      +
    • 1 byte control byte:
      +      bit 0: is follow on fragment?  (1 = true, 0 = false, must be 0)
+   bits 1-2: delivery type
+             (0x0 = LOCAL, 0x01 = TUNNEL, 0x02 = ROUTER)
+      bit 3: delay included?  (1 = true, 0 = false)
+      bit 4: fragmented?  (1 = true, 0 = false)
+      bit 5: extended options?  (1 = true, 0 = false)
+   bits 6-7: reserved
      • +
    • if the delivery type was TUNNEL, a 4 byte tunnel ID
      • +
    • if the delivery type was TUNNEL or ROUTER, a 32 byte router hash
      • +
    • if the delay included flag is true, a 1 byte value:
      +      bit 0: type (0 = strict, 1 = randomized)
+   bits 1-7: delay exponent (2^value minutes)
      • +
    • if the fragmented flag is true, a 4 byte message ID
      • +
    • if the extended options flag is true:
      +   = a 1 byte option size (in bytes)
+   = that many bytes
      • +
    • 2 byte size of the I2NP message or this fragment
      • +
    + +

    If the first bit being 1, the instructions are:

    +
      +
    • 1 byte control byte:
      +      bit 0: is follow on fragment?  (1 = true, 0 = false, must be 1)
+   bits 1-6: fragment number
+      bit 7: is last? (1 = true, 0 = false)
      • +
    • 4 byte message ID (same one defined in the first fragment)
      • +
    • 2 byte size of this fragment
      • +
    + +

    The I2NP message is encoded in its standard form, and the +preprocessed payload must be padded to a multiple of 16 bytes.

    + * */ public class FragmentHandler { @@ -165,21 +224,19 @@ public class FragmentHandler { _log.debug("endpoint IV: " + Base64.encode(preV, validLength - HopProcessor.IV_LENGTH, HopProcessor.IV_LENGTH)); Hash v = _context.sha().calculateHash(preV, 0, validLength); + _validateCache.release(ba); - //Hash v = _context.sha().calculateHash(preV, 0, validLength); boolean eq = DataHelper.eq(v.getData(), 0, preprocessed, offset + HopProcessor.IV_LENGTH, 4); if (!eq) { - if (_log.shouldLog(Log.WARN)) - _log.warn("Corrupt tunnel message - verification fails: \n" + Base64.encode(preprocessed, offset+HopProcessor.IV_LENGTH, 4) - + "\n" + Base64.encode(v.getData(), 0, 4)); - if (_log.shouldLog(Log.WARN)) - _log.warn("nomatching endpoint: # pad bytes: " + (paddingEnd-(HopProcessor.IV_LENGTH+4)-1) + "\n" + if (_log.shouldLog(Log.WARN)) { + _log.warn("Corrupt tunnel message - verification fails: " + Base64.encode(preprocessed, offset+HopProcessor.IV_LENGTH, 4) + + " != " + Base64.encode(v.getData(), 0, 4)); + _log.warn("No matching endpoint: # pad bytes: " + (paddingEnd-(HopProcessor.IV_LENGTH+4)-1) + " offset=" + offset + " length=" + length + " paddingEnd=" + paddingEnd + Base64.encode(preprocessed, offset, length)); + } } - _validateCache.release(ba); - if (eq) { int excessPadding = paddingEnd - (HopProcessor.IV_LENGTH + 4 + 1); if (excessPadding > 0) // suboptimal fragmentation From 2cd5c209f5f5c190ddce31d71c2278b6deab7553 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 19 Dec 2009 16:52:49 +0000 Subject: [PATCH 102/127] unused cleanup --- router/java/src/net/i2p/router/tunnel/TunnelParticipant.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/router/java/src/net/i2p/router/tunnel/TunnelParticipant.java b/router/java/src/net/i2p/router/tunnel/TunnelParticipant.java index a73208e3b..6263f8ec7 100644 --- a/router/java/src/net/i2p/router/tunnel/TunnelParticipant.java +++ b/router/java/src/net/i2p/router/tunnel/TunnelParticipant.java @@ -101,8 +101,11 @@ public class TunnelParticipant { } } +/**** private int _periodMessagesTransferred; private long _lastCoallesced = System.currentTimeMillis(); +****/ + /** * take note that the peers specified were able to push us data. hmm, is this safe? * this could be easily gamed to get us to rank some peer of their choosing as quite From f226392c9d74b0e3cc7089e2a7944a73a2bdbffe Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 19 Dec 2009 16:53:49 +0000 Subject: [PATCH 103/127] static access fix --- router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java b/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java index e1cec3607..5e4456490 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java +++ b/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java @@ -54,9 +54,7 @@ class BuildExecutor implements Runnable { // Get stat manager, get recognized bandwidth tiers StatManager statMgr = _context.statManager(); - @SuppressWarnings("static-access") - /* FIXME Accessing static field "BW_CAPABILITY_CHARS" FIXME */ - String bwTiers = _context.router().getRouterInfo().BW_CAPABILITY_CHARS; + String bwTiers = RouterInfo.BW_CAPABILITY_CHARS; // For each bandwidth tier, create tunnel build agree/reject/expire stats for (int i = 0; i < bwTiers.length(); i++) { String bwTier = String.valueOf(bwTiers.charAt(i)); From 72eafe0920d5b0a48663a4dffbf27701428fa9f6 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 19 Dec 2009 16:54:59 +0000 Subject: [PATCH 104/127] * Tunnels: Reduce the drop probability for TunnelBuildMessages at the OBEP --- .../src/net/i2p/router/tunnel/TunnelDispatcher.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java index 681dadec1..6b5457719 100644 --- a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java +++ b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java @@ -605,12 +605,17 @@ public class TunnelDispatcher implements Service { if (pctDrop <= 0) return false; // increase the drop probability for OBEP, + // (except lower it for tunnel build messages (type 21)), // and lower it for IBGW, for network efficiency double len = length; - if (type.startsWith("OBEP")) - len *= 1.5; - else if (type.startsWith("IBGW")) + if (type.startsWith("OBEP")) { + if (type.equals("OBEP 21")) + len /= 1.5; + else + len *= 1.5; + } else if (type.startsWith("IBGW")) { len /= 1.5; + } // drop in proportion to size w.r.t. a standard 1024-byte message // this is a little expensive but we want to adjust the curve between 0 and 1 // Most messages are 1024, only at the OBEP do we see other sizes From 579b450029cba2068154e724ac383c2a35360867 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 19 Dec 2009 16:56:38 +0000 Subject: [PATCH 105/127] clean up context usage --- .../router/tunnel/InboundEndpointProcessor.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/router/java/src/net/i2p/router/tunnel/InboundEndpointProcessor.java b/router/java/src/net/i2p/router/tunnel/InboundEndpointProcessor.java index 6c572cb42..7376a5046 100644 --- a/router/java/src/net/i2p/router/tunnel/InboundEndpointProcessor.java +++ b/router/java/src/net/i2p/router/tunnel/InboundEndpointProcessor.java @@ -1,6 +1,5 @@ package net.i2p.router.tunnel; -import net.i2p.I2PAppContext; import net.i2p.data.ByteArray; import net.i2p.data.Hash; import net.i2p.router.RouterContext; @@ -16,7 +15,7 @@ import net.i2p.util.Log; * */ public class InboundEndpointProcessor { - private I2PAppContext _context; + private RouterContext _context; private Log _log; private TunnelCreatorConfig _config; private IVValidator _validator; @@ -24,10 +23,10 @@ public class InboundEndpointProcessor { static final boolean USE_ENCRYPTION = HopProcessor.USE_ENCRYPTION; private static final ByteCache _cache = ByteCache.getInstance(128, HopProcessor.IV_LENGTH); - public InboundEndpointProcessor(I2PAppContext ctx, TunnelCreatorConfig cfg) { + public InboundEndpointProcessor(RouterContext ctx, TunnelCreatorConfig cfg) { this(ctx, cfg, DummyValidator.getInstance()); } - public InboundEndpointProcessor(I2PAppContext ctx, TunnelCreatorConfig cfg, IVValidator validator) { + public InboundEndpointProcessor(RouterContext ctx, TunnelCreatorConfig cfg, IVValidator validator) { _context = ctx; _log = ctx.logManager().getLog(InboundEndpointProcessor.class); _config = cfg; @@ -73,23 +72,19 @@ public class InboundEndpointProcessor { _cache.release(ba); - // now for a little bookkeeping - RouterContext ctx = null; - if (_context instanceof RouterContext) - ctx = (RouterContext)_context; - if ( (ctx != null) && (_config.getLength() > 0) ) { + if (_config.getLength() > 0) { int rtt = 0; // dunno... may not be related to an rtt if (_log.shouldLog(Log.DEBUG)) _log.debug("Received a " + length + "byte message through tunnel " + _config); for (int i = 0; i < _config.getLength(); i++) - ctx.profileManager().tunnelDataPushed(_config.getPeer(i), rtt, length); + _context.profileManager().tunnelDataPushed(_config.getPeer(i), rtt, length); _config.incrementVerifiedBytesTransferred(length); } return true; } - private void decrypt(I2PAppContext ctx, TunnelCreatorConfig cfg, byte iv[], byte orig[], int offset, int length) { + private void decrypt(RouterContext ctx, TunnelCreatorConfig cfg, byte iv[], byte orig[], int offset, int length) { Log log = ctx.logManager().getLog(OutboundGatewayProcessor.class); ByteArray ba = _cache.acquire(); byte cur[] = ba.getData(); // new byte[HopProcessor.IV_LENGTH]; // so we dont malloc From 2a1d358141e7341c8c88e97a7d42f5e32469ce0c Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 19 Dec 2009 17:10:39 +0000 Subject: [PATCH 106/127] * Profile, DBHistory: - Tweak the rate periods - Add a global fail rate stat - Increase the HashMap sizes --- router/java/src/net/i2p/router/peermanager/DBHistory.java | 8 ++++++-- .../src/net/i2p/router/peermanager/ProfileOrganizer.java | 8 +++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/router/java/src/net/i2p/router/peermanager/DBHistory.java b/router/java/src/net/i2p/router/peermanager/DBHistory.java index a8e084e49..36b9bc9a3 100644 --- a/router/java/src/net/i2p/router/peermanager/DBHistory.java +++ b/router/java/src/net/i2p/router/peermanager/DBHistory.java @@ -105,6 +105,7 @@ public class DBHistory { */ public RateStat getFailedLookupRate() { return _failedLookupRate; } + /** not sure how much this is used, to be investigated */ public RateStat getInvalidReplyRate() { return _invalidReplyRate; } /** @@ -115,6 +116,7 @@ public class DBHistory { public void lookupSuccessful() { _successfulLookups++; _failedLookupRate.addData(0, 0); + _context.statManager().addRateData("peer.failedLookupRate", 0, 0); _lastLookupSuccessful = _context.clock().now(); } @@ -124,6 +126,7 @@ public class DBHistory { public void lookupFailed() { _failedLookups++; _failedLookupRate.addData(1, 0); + _context.statManager().addRateData("peer.failedLookupRate", 1, 0); _lastLookupFailed = _context.clock().now(); } @@ -136,6 +139,7 @@ public class DBHistory { // Fixme, redefined this to include both lookup and store fails, // need to fix the javadocs _failedLookupRate.addData(0, 0); + _context.statManager().addRateData("peer.failedLookupRate", 0, 0); _lastStoreSuccessful = _context.clock().now(); } @@ -275,9 +279,9 @@ public class DBHistory { private void createRates(String statGroup) { if (_failedLookupRate == null) - _failedLookupRate = new RateStat("dbHistory.failedLookupRate", "How often does this peer to respond to a lookup?", statGroup, new long[] { 60*1000l, 60*60*1000l, 24*60*60*1000l }); + _failedLookupRate = new RateStat("dbHistory.failedLookupRate", "How often does this peer to respond to a lookup?", statGroup, new long[] { 10*60*1000l, 60*60*1000l, 24*60*60*1000l }); if (_invalidReplyRate == null) - _invalidReplyRate = new RateStat("dbHistory.invalidReplyRate", "How often does this peer give us a bad (nonexistant, forged, etc) peer?", statGroup, new long[] { 30*60*1000l, 60*60*1000l, 24*60*60*1000l }); + _invalidReplyRate = new RateStat("dbHistory.invalidReplyRate", "How often does this peer give us a bad (nonexistant, forged, etc) peer?", statGroup, new long[] { 30*60*1000l }); _failedLookupRate.setStatLog(_context.statManager().getStatLog()); _invalidReplyRate.setStatLog(_context.statManager().getStatLog()); } diff --git a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java index 20f0fba3d..d249dc968 100644 --- a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java +++ b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java @@ -97,10 +97,10 @@ public class ProfileOrganizer { _log = context.logManager().getLog(ProfileOrganizer.class); _comp = new InverseCapacityComparator(); _fastPeers = new HashMap(16); - _highCapacityPeers = new HashMap(16); + _highCapacityPeers = new HashMap(32); _wellIntegratedPeers = new HashMap(16); - _notFailingPeers = new HashMap(64); - _notFailingPeersList = new ArrayList(64); + _notFailingPeers = new HashMap(256); + _notFailingPeersList = new ArrayList(256); _failingPeers = new HashMap(16); _strictCapacityOrder = new TreeSet(_comp); _thresholdSpeedValue = 0.0d; @@ -113,6 +113,8 @@ public class ProfileOrganizer { _context.statManager().createRateStat("peer.profileThresholdTime", "How long the reorg takes determining the tier thresholds", "Peers", new long[] { 10*60*1000 }); _context.statManager().createRateStat("peer.profilePlaceTime", "How long the reorg takes placing peers in the tiers", "Peers", new long[] { 10*60*1000 }); _context.statManager().createRateStat("peer.profileReorgTime", "How long the reorg takes overall", "Peers", new long[] { 10*60*1000 }); + // used in DBHistory + _context.statManager().createRateStat("peer.failedLookupRate", "DB Lookup fail rate", "Peers", new long[] { 10*60*1000l, 60*60*1000l, 24*60*60*1000l }); } private void getReadLock() { From 9bf22fb0d336b47dd66d40545eeb0a2356f8a33e Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 19 Dec 2009 17:41:47 +0000 Subject: [PATCH 107/127] stats.jsp tagging --- .../net/i2p/router/web/StatsGenerator.java | 29 +++++++++++-------- apps/routerconsole/java/strings/Strings.java | 19 ++++++++++++ 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java b/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java index 9ac1ae542..4ddc6e6f4 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java @@ -40,7 +40,7 @@ public class StatsGenerator { String group = (String)entry.getKey(); Set stats = (Set)entry.getValue(); buf.append("\n"); + buf.append(_(group)).append("\n"); for (Iterator statIter = stats.iterator(); statIter.hasNext(); ) { String stat = (String)statIter.next(); buf.append("